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: brianPlummer/AndroidEncryptionExample
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: feature/license
Choose a base ref
...
head repository: brianPlummer/AndroidEncryptionExample
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.
  • 17 commits
  • 8 files changed
  • 1 contributor

Commits on Jan 13, 2017

  1. get encryption off the main thread

    @brianPlummer
    brianPlummer committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    c80536f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5 from brianPlummer/feature/license 

    add MIT license
    @brianPlummer
    brianPlummer authored Jan 13, 2017
    Configuration menu
    Copy the full SHA
    95556f7 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #6 from brianPlummer/feature/uiAsync 

    get encryption off the main thread in sample
    @brianPlummer
    brianPlummer authored Jan 13, 2017
    Configuration menu
    Copy the full SHA
    fa98543 View commit details
    Browse the repository at this point in the history

  4. update gradle

    @brianPlummer
    brianPlummer committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    5f23c93 View commit details
    Browse the repository at this point in the history

  5. update build tools

    @brianPlummer
    brianPlummer committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    d5eccef View commit details
    Browse the repository at this point in the history

  6. update compile, target sdk, and support lib

    @brianPlummer
    brianPlummer committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    cc8a557 View commit details
    Browse the repository at this point in the history

  7. update spongycastle

    @brianPlummer
    brianPlummer committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    76020a6 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #7 from brianPlummer/tech/updates 

    update build tools, gradle, compile/target sdk, spongycastle
    @brianPlummer
    brianPlummer authored Jan 13, 2017
    Configuration menu
    Copy the full SHA
    9feda95 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2017

  1. add in AES/CBC/PKCS7Padding and test

    @brianPlummer
    brianPlummer committed Feb 11, 2017
    Configuration menu
    Copy the full SHA
    05d8f09 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8 from brianPlummer/tech/pkcs7padding 

    add in AES/CBC/PKCS7Padding and test
    @brianPlummer
    brianPlummer authored Feb 11, 2017
    Configuration menu
    Copy the full SHA
    c34e17e View commit details
    Browse the repository at this point in the history

  3. Update README.md 

    some readme sprucing
    @brianPlummer
    brianPlummer authored Feb 11, 2017
    Configuration menu
    Copy the full SHA
    5097d23 View commit details
    Browse the repository at this point in the history

  4. Update README.md

    @brianPlummer
    brianPlummer authored Feb 11, 2017
    Configuration menu
    Copy the full SHA
    b2056ea View commit details
    Browse the repository at this point in the history

  5. add in sample gif

    @brianPlummer
    brianPlummer committed Feb 11, 2017
    Configuration menu
    Copy the full SHA
    8667734 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of github.com:brianPlummer/AndroidEncryptionExa… 

    …mple
    @brianPlummer
    brianPlummer committed Feb 11, 2017
    Configuration menu
    Copy the full SHA
    1577ffe View commit details
    Browse the repository at this point in the history

  7. Update README.md

    @brianPlummer
    brianPlummer authored Feb 11, 2017
    Configuration menu
    Copy the full SHA
    dfeb80b View commit details
    Browse the repository at this point in the history

  8. Update README.md

    @brianPlummer
    brianPlummer authored Feb 11, 2017
    Configuration menu
    Copy the full SHA
    41695bd View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2017

  1. Update README.md

    @brianPlummer
    brianPlummer authored Feb 15, 2017
    Configuration menu
    Copy the full SHA
    87102a1 View commit details
    Browse the repository at this point in the history
Loading