aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Cleanup manifestDominik Schürmann2015-05-051-15/+16
| |
* | Fix nullpointer in file decryptionDominik Schürmann2015-05-051-1/+1
|/
* Fix revoked/expired state in decrypt activityDominik Schürmann2015-05-044-37/+27
|
* Fix cancel/skip in create key wizardDominik Schürmann2015-05-043-52/+35
|
* Display notify above keyboard in CreateKeyEmailFragmentDominik Schürmann2015-05-041-2/+2
|
* Fix email patternDominik Schürmann2015-05-041-1/+1
|
* Merge branch 'Hiperzone-development' into developmentDominik Schürmann2015-05-043-50/+94
|\
| * Use more simple email validation regexDominik Schürmann2015-05-041-7/+8
| |
| * Merge branch 'development' of https://github.com/Hiperzone/open-keychain ↵Dominik Schürmann2015-05-043-51/+94
|/| | | | | | | | | | | | | into Hiperzone-development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
| * -removed unneeded inputType attribute from xml files (+1 squashed commits)Daniel Ramos2015-04-303-12/+10
| | | | | | | | | | | | Squashed commits: [ef54e68] -code style fixing
| * -Removed unneeded view references from the fragment class since they are not ↵Daniel Ramos2015-04-261-7/+3
| | | | | | | | | | | | used outside of createView. -cleanup
| * -removed unneeded code from previous commits. I tested on a KitKat(4.4.2) ↵Daniel Ramos2015-04-261-3/+0
| | | | | | | | and Lollipop (5.1) phone and everything seems to be preserved as expected.
| * Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Daniel Ramos2015-04-2643-462/+791
| |\ | | | | | | | | | into development
| * \ Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into ↵Daniel Ramos2015-04-245-44/+92
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
| | * \ Merge branch 'feature/emailImprovements' into localdevDaniel Ramos2015-04-246-45/+97
| | |\ \
| | | * | -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-146-30/+82
| | |/ / | | | | | | | | | | | | | | | | | | | | -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.
* | | | Merge branch 'manojkhannakm-development' into developmentDominik Schürmann2015-05-044-2/+288
|\ \ \ \
| * | | | Temporary fix for gradle dependency bugDominik Schürmann2015-05-041-0/+6
| | | | |
| * | | | 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-044-2/+286
|/| | | | | | | | | | | | | | | | | | | into manojkhannakm-development
| * | | | Espresso test for CreateKeyActivityManoj Khanna2015-04-254-5/+286
| | | | |
* | | | | 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
* | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-05-041-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | development
| * \ \ \ \ Merge pull request #1238 from wfaulk/fix-testsDominik Schürmann2015-05-041-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | updated robolectric to support new android support libs
| | * | | | | updated robolectric to support new android support libsWilliam Faulk2015-05-031-1/+2
| |/ / / / /
* / / / / / Fix yubikey stringsDominik Schürmann2015-05-012-7/+7
|/ / / / /
* | | | | 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-304-27/+13
| | | | |
* | | | | API: Allow selection of decryption keys when decryption failsDominik Schürmann2015-04-306-6/+188
| | | | |
* | | | | Update snackbarDominik Schürmann2015-04-301-0/+0
| | | | |
* | | | | Update wrapper to verify local cacheDominik Schürmann2015-04-291-0/+0
| | | | |
* | | | | Use own gradle wrapper to verify downloaded gradle package via SHA-256 sum. ↵Dominik Schürmann2015-04-292-0/+1
| | | | | | | | | | | | | | | | | | | | See https://github.com/gradle/gradle/pull/448
* | | | | Merge pull request #1233 from wfaulk/readmeDominik Schürmann2015-04-291-10/+12
|\ \ \ \ \ | | | | | | | | | | | | Update README.md with new build info
| * | | | | Update README.md with new build infoWilliam Faulk2015-04-281-10/+12
|/ / / / /
* | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2015-04-281-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | development
| * | | | | Display development build statusDominik Schürmann2015-04-281-2/+2
| | | | | |
* | | | | | 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-274-17/+44
| | | | |
* | | | | add distinct status for messages signed by "your" keyVincent Breitmoser2015-04-272-0/+14
| | | | |
* | | | | profiling says: caching qrCode bitmaps is a good ideaVincent Breitmoser2015-04-272-19/+43
| |_|_|/ |/| | |
* | | | Merge pull request #1225 from vectorijk/SwitchToMaterialDrawerDominik Schürmann2015-04-261-2/+2
|\ \ \ \ | | | | | | | | | | update lib MaterialDrawer to latest(2.8.2)
| * | | | update lib MaterialDrawer to latest(2.8.2)vectorijk2015-04-251-2/+2
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 15:13:49 +0000