Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: namanix/Samples-for-Java
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: blackberry/Samples-for-Java
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 15 commits
  • 101 files changed
  • 5 contributors

Commits on Oct 9, 2012

  1. Removed redundant constant. 

    Changed code to use desired AID.
    Rob Williams Jnr
    Rob Williams Jnr committed Oct 9, 2012
    Configuration menu
    Copy the full SHA
    cabda1b View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2012

  1. Removing duplicate / compiled assets.

    Rob Williams Jnr
    Rob Williams Jnr committed Oct 10, 2012
    Configuration menu
    Copy the full SHA
    ce8ca5c View commit details
    Browse the repository at this point in the history

  2. Removing duplicate / compiled assets.

    Rob Williams Jnr
    Rob Williams Jnr committed Oct 10, 2012
    Configuration menu
    Copy the full SHA
    2c71f8f View commit details
    Browse the repository at this point in the history

  3. Tidied constants. 

    Added default APDU.
    Rob Williams Jnr
    Rob Williams Jnr committed Oct 10, 2012
    Configuration menu
    Copy the full SHA
    53ad578 View commit details
    Browse the repository at this point in the history

  4. Added settable APDU. 

    Removed duplicate AID.
    Rob Williams Jnr
    Rob Williams Jnr committed Oct 10, 2012
    Configuration menu
    Copy the full SHA
    4f15875 View commit details
    Browse the repository at this point in the history

  5. Updated to use new AID function. 

    Updated to send new APDU.
    Rob Williams Jnr
    Rob Williams Jnr committed Oct 10, 2012
    Configuration menu
    Copy the full SHA
    70d907d View commit details
    Browse the repository at this point in the history

  6. Changed call to new function.

    Rob Williams Jnr
    Rob Williams Jnr committed Oct 10, 2012
    Configuration menu
    Copy the full SHA
    07c84f1 View commit details
    Browse the repository at this point in the history

  7. Added fields to edit APDU. 

    Updated AID to use new function.
    Rob Williams Jnr
    Rob Williams Jnr committed Oct 10, 2012
    Configuration menu
    Copy the full SHA
    c53bfb3 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2012

  1. Merge branch 'master' of https://github.com/blackberry/Samples-for-Java 

    Conflicts:
	NFC/NfcTransactionHandler/src/nfc/sample/nfctransaction/Constants.java
	NFC/NfcTransactionHandler/src/nfc/sample/nfctransaction/commands/Iso7816Command.java

Also updated version number.
    Rob Williams Jnr
    Rob Williams Jnr committed Nov 5, 2012
    Configuration menu
    Copy the full SHA
    57233b9 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2012

  1. Corrected to use byte[] for AID.

    Rob Williams Jnr
    Rob Williams Jnr committed Nov 6, 2012
    Configuration menu
    Copy the full SHA
    f3af554 View commit details
    Browse the repository at this point in the history

  2. Merge pull request blackberry#25 from RobbieDubya/master 

    Added editable APDU.
    @timwindsor
    timwindsor committed Nov 6, 2012
    Configuration menu
    Copy the full SHA
    e2a6c85 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2012

  1. Fixed bug Exception launched when it had no fields 

    Check if numFields is 0, set the fieldWidth to 0 instead of making a division with that number.
This way it avoids a division by zero.
    @joaquinmag
    joaquinmag committed Dec 9, 2012
    Configuration menu
    Copy the full SHA
    167f17a View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2013

  1. Merge pull request blackberry#26 from joaquinmag/patch-1 

    Fixed bug Exception launched when it had no fields
    @pelegri
    pelegri committed Jan 30, 2013
    Configuration menu
    Copy the full SHA
    3adf263 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2013

  1. updating links and removing references to github messages

    Tim Windsor
    Tim Windsor committed Apr 15, 2013
    Configuration menu
    Copy the full SHA
    3feceb2 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2013

  1. Merge pull request blackberry#27 from timwindsor/readmeUpdate 

    updating links and removing references to github messages
    @timwindsor
    timwindsor committed Apr 17, 2013
    Configuration menu
    Copy the full SHA
    2b4f1cc View commit details
    Browse the repository at this point in the history
Loading