aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Display Key moved to FragmentDurgesh2016-03-293-171/+224
| | |/ / | |/| |
| * | | change sync interval on change in codeAdithya Abraham Philip2016-03-244-12/+63
| * | | Merge pull request #1785 from advaita13/wifi-only-fixVincent2016-03-246-22/+102
| |\ \ \
| | * | | Final commitAdvaita2016-03-236-22/+102
| * | | | Merge pull request #1782 from fiaxh/share_key_mimeDominik Schürmann2016-03-241-1/+1
| |\ \ \ \
| | * | | | Set MIME application/pgp-keys when sending a keyfiaxh2016-03-141-1/+1
| | |/ / /
| * | | | use new TokenAutoComplete 2.0.7, fixes #1636Vincent Breitmoser2016-03-232-11/+0
| * | | | get rid of code path for pin and notation data handlingVincent Breitmoser2016-03-237-113/+70
| * | | | Fix CertifyKeyActivity back button on action bar not working #1758Durgesh2016-03-221-0/+11
| | |/ / | |/| |
| * | | update null-check for duplicates, and add matching indexes to name and email ...Vincent Breitmoser2016-03-162-7/+13
| * | | small update to duplicate detectionVincent Breitmoser2016-03-151-2/+5
| * | | Merge pull request #1777 from fjodorver/masterVincent2016-03-151-2/+2
| |\ \ \
| | * | | Updated HAS_DUPLICATE_USER_ID in KeychainProvider to use name and email addre...fjodor2016-03-101-2/+2
| * | | | fix ridiculous database migration bug introduced by d6e4936fa54dc3577296dbada...Vincent Breitmoser2016-03-151-9/+7
| | |/ / | |/| |
| * | | Merge pull request #1780 from AlexFJW/backup-code-selectionDominik Schürmann2016-03-121-0/+25
| |\ \ \
| | * | | Provisional backup-code text selection fixAlex Fong2016-03-121-0/+25
* | | | | OKhttp url factoryMichal Kepkowski2016-04-062-8/+26
* | | | | okhttp3Michal Kepkowski2016-03-1410-109/+127
|/ / / /
* | | | Merge pull request #1763 from fjodorver/masterVincent2016-03-104-15/+38
|\ \ \ \ | | |/ / | |/| |
| * | | Increased version DB and added a migration path from an old database formatfjodor2016-03-071-2/+5
| * | | Save split user ids in database #1745fjodor2016-03-074-13/+33
* | | | service: add opportunistic mode to encryptionVincent Breitmoser2016-03-101-20/+26
* | | | Fix display of keyserver item in dark themefiaxh2016-03-101-3/+4
| |/ / |/| |
* | | Fix NullPointerException in ImportKeysListFragment.checkAndRequestReadPermiss...Durgesh2016-03-081-1/+1
* | | Open keyboard for backup codeDominik Schürmann2016-03-081-22/+31
* | | Revert "Use non-breaking spaces for backup code MaskedEditText"Dominik Schürmann2016-03-081-7/+2
* | | Fix code style and documentation in BaseSecurityTokenNfcActivityDominik Schürmann2016-03-082-40/+45
* | | Fix documentation of nfcGenerateOnCardKeyDominik Schürmann2016-03-081-3/+1
* | | Fix comment in nfcGenerateOnCardKeyDominik Schürmann2016-03-081-1/+1
* | | Add nfcGenerateOnCardKey by Joey Castillo before it gets lostDominik Schürmann2016-03-081-0/+42
* | | Merge branch 'okHttpLinkedToken' of https://github.com/kepuss/open-keychain i...Dominik Schürmann2016-03-074-82/+81
|\ \ \
| * | | okHttpMichal Kepkowski2016-03-044-82/+81
* | | | fix get key ids by removing another leftoverDominik Schürmann2016-03-071-1/+0
* | | | fix bug from leftover line in openpgpserviceVincent Breitmoser2016-03-071-1/+0
* | | | Merge pull request #1757 from 007durgesh219/Issue#1752Dominik Schürmann2016-03-061-1/+7
|\ \ \ \
| * | | | Fix K-9 stable: OpenPGP: Unknown compression algorithm #1752Durgesh2016-03-061-1/+7
* | | | | Merge pull request #1747 from runnerway/fix-alreadyaddedDominik Schürmann2016-03-061-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove uri from pending even when already addedAndrea Torlaschi2016-03-041-2/+2
| |/ / /
* | | | Merge pull request #1750 from 007durgesh219/Issue#1746Dominik Schürmann2016-03-051-1/+1
|\ \ \ \
| * | | | Fix Dark theme no longer works in main screen on android 5, Issue#1746Durgesh2016-03-051-1/+1
| | |/ / | |/| |
* | | | Merge pull request #1738 from runnerway/storage-permission-fixDominik Schürmann2016-03-051-1/+8
|\ \ \ \
| * | | | Always check read permissionAndrea Torlaschi2016-03-021-1/+8
* | | | | Merge pull request #1751 from runnerway/decrypt-filenameDominik Schürmann2016-03-052-4/+14
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Set filename after decryptionAndrea Torlaschi2016-03-051-2/+3
| * | | | Extend FileProvider to support name updateAndrea Torlaschi2016-03-051-2/+11
| | |/ / | |/| |
* / | | Update ContactSyncAdapterService.javaAdvaita2016-03-031-0/+7
|/ / /
* / / add v11 to supported api versionsVincent Breitmoser2016-03-021-3/+6
|/ /
* | handle openpgp4fpr intent filter as import rather than certify (see #1661)Vincent Breitmoser2016-03-021-1/+4
* | small nullpointer fixVincent Breitmoser2016-03-021-3/+6
* | nfc: disable broadcomWorkaround for TagDispatcher to reduce delay (see #1734)Vincent Breitmoser2016-03-021-1/+1