aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into ↵Daniel Ramos2015-04-242-44/+89
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
| | * | -Fixed a crash while recreating CreateKeyEmailFragmentDaniel Ramos2015-04-241-16/+16
| | | | | | | | | | | | | | | | | | | | -Email data is properly restored while rotating the Activity. -Added necessary logic to guarantee that an email is actually valid before continuing, there are verifications for empty, duplicated and invalid formatted emails for both additional and main email.
| | * | -Improved email sanity verifications when adding emails when creating a new KeyDaniel Ramos2015-04-143-30/+79
| | | | | | | | | | | | | | | | | | | | | | | | -fixed a few NFC crashes -fixed a few instances when showing the keyboard would crash the Activity -fixed a case where adding new emails would crash the app if the user went back and forth between the Add Email fragment and the Add Name fragment.
* | | | Fix dublicated code in CreateKeyEmailFragmentDominik Schürmann2015-05-041-4/+0
| | | |
* | | | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ↵Dominik Schürmann2015-05-041-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | into manojkhannakm-development
| * | | | Espresso test for CreateKeyActivityManoj Khanna2015-04-251-5/+6
| | | | |
* | | | | license header for PgpCertifyOperationDominik Schürmann2015-05-041-1/+19
| | | | |
* | | | | Apply patch from ↵Dominik Schürmann2015-05-041-2/+9
| | | | | | | | | | | | | | | | | | | | https://github.com/open-keychain/open-keychain/issues/1222#issuecomment-98582938
* | | | | Apply patch from https://github.com/open-keychain/open-keychain/issues/1240 ↵Dominik Schürmann2015-05-041-8/+22
| | | | | | | | | | | | | | | | | | | | with db upgrade
* | | | | More nullpointer fixesDominik Schürmann2015-05-011-1/+1
| | | | |
* | | | | Fix nullpointer in EncryptKeyCompletionViewDominik Schürmann2015-05-011-2/+2
| | | | |
* | | | | Remove time from key creation displayDominik Schürmann2015-04-301-1/+0
| | | | |
* | | | | Fix key creation string and displayDominik Schürmann2015-04-303-25/+10
| | | | |
* | | | | API: Allow selection of decryption keys when decryption failsDominik Schürmann2015-04-303-6/+144
| | | | |
* | | | | fix crash when moving focus from EncryptKeyCompletionView with unknown textVincent Breitmoser2015-04-281-1/+1
| | | | |
* | | | | display unknown keys red rather than orangeVincent Breitmoser2015-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For an unknown key, there is no indication of the state the key is in. To indicate both immediate action required, and to make this status equal to its worst case (rather than *better* than its worst case), the status is displayed in red. At some point, we will probably want to download unknown keys automatically, at which point an unknown key will actually be an error state. This is an intermediate solution until then.
* | | | | fix "select all" in key list multi-selectVincent Breitmoser2015-04-281-1/+1
| | | | |
* | | | | prevent crashes in EncryptKeyCompletionViewVincent Breitmoser2015-04-271-2/+10
| | | | |
* | | | | display creation dates for ambiguous user idsVincent Breitmoser2015-04-272-14/+29
| | | | |
* | | | | add distinct status for messages signed by "your" keyVincent Breitmoser2015-04-271-0/+13
| | | | |
* | | | | profiling says: caching qrCode bitmaps is a good ideaVincent Breitmoser2015-04-272-19/+43
| |_|_|/ |/| | |
* | | | UI fixes for Android < 5Dominik Schürmann2015-04-263-11/+6
| | | |
* | | | Put decrypt result in toolbar, some ui fixes for decryptDominik Schürmann2015-04-262-12/+13
| | | |
* | | | Switch to new support lib version 22.1Dominik Schürmann2015-04-2510-41/+19
|/ / /
* | | Set different titles when changing in nav drawerDominik Schürmann2015-04-251-6/+10
| | |
* | | Fix empty screen when clicking on encrypt in details viewDominik Schürmann2015-04-251-5/+2
| | |
* | | Merge pull request #1220 from vectorijk/SwitchToMaterialDrawerDominik Schürmann2015-04-251-20/+154
|\ \ \ | | | | | | | | Switch to MaterialDrawer library
| * | | Fix #1197 Switch to MaterialDrawer libraryvectorijk2015-04-241-44/+85
| | | |
| * | | Introduce and Switch to mikepenz/MaterialDrawervectorijk2015-04-241-25/+118
| |/ /
* | | fix encrypt activity layoutVincent Breitmoser2015-04-241-2/+1
| | |
* | | revamp decrypt uiVincent Breitmoser2015-04-243-149/+347
|/ /
* | Fixed Snackbar behind layoutManoj Khanna2015-04-222-13/+13
| | | | | | | | Surrounded string with quotes
* | keyserver verification on additionAdithya Abraham Philip2015-04-222-1/+379
| |
* | corrected possible null pointerAdithya Abraham Philip2015-04-221-1/+1
| |
* | Simplify ImportKeysProxyActivityDominik Schürmann2015-04-211-29/+12
| |
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-04-218-52/+192
|\ \ | | | | | | | | | development
| * | added log to QR code scan/import failAdithya Abraham Philip2015-04-211-12/+11
| | |
| * | Fix for initialization failure when card returns FCI in data field.Joey Castillo2015-04-201-1/+1
| | |
| * | Track state of PIN verification on smart card; only verify when needed.Joey Castillo2015-04-201-2/+33
| | |
| * | support for handling keyserver urls from browser, added documentationAdithya Abraham Philip2015-04-206-37/+147
| | |
* | | Cleanup in HkpKeyserverDominik Schürmann2015-04-201-4/+3
|/ /
* | Format KeyListFragmentDominik Schürmann2015-04-181-10/+9
| |
* | Temporarily fix devices without nfcDominik Schürmann2015-04-181-0/+6
| |
* | Use portrait mode for qr code scanningDominik Schürmann2015-04-151-10/+8
| |
* | More cleanupDominik Schürmann2015-04-159-324/+28
| |
* | Fix YubiKey naming, cleanupDominik Schürmann2015-04-1510-62/+54
| |
* | Clean up NfcOperationActivityDominik Schürmann2015-04-151-8/+6
| |
* | Reformat nfcVerifyPINDominik Schürmann2015-04-151-6/+6
| |
* | Consolidate PIN verify operation in nfcVerifyPIN method.Joey Castillo2015-04-141-44/+28
| |
* | Move PIN verify inside sign/decrypt operation and set correct mode.Joey Castillo2015-04-141-19/+45
|/