aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix email patternDominik Schürmann2015-05-041-1/+1
|
* 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-2641-450/+770
| |\ | | | | | | | | | 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
| | * | -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.
* | | | 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
* | | | | 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
| | | | |
* | | | | 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
| |_|_|/ |/| | |
* | | | UI fixes for Android < 5Dominik Schürmann2015-04-265-22/+19
| | | |
* | | | Remove unused decrypt result layoutDominik Schürmann2015-04-263-140/+0
| | | |
* | | | Put decrypt result in toolbar, some ui fixes for decryptDominik Schürmann2015-04-2616-16/+162
| | | |
* | | | Switch to new support lib version 22.1Dominik Schürmann2015-04-2512-43/+21
|/ / /
* | | Update in-app contributor listDominik Schürmann2015-04-251-3/+22
| | |
* | | 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
| | |
* | | Update lib section in aboutDominik Schürmann2015-04-251-2/+2
| | |
* | | Remove old navigation drawer dependencyDominik Schürmann2015-04-252-9/+1
| | |
* | | Merge pull request #1220 from vectorijk/SwitchToMaterialDrawerDominik Schürmann2015-04-253-20/+182
|\ \ \ | | | | | | | | Switch to MaterialDrawer library
| * | | Fix #1197 Switch to MaterialDrawer libraryvectorijk2015-04-242-46/+89
| | | |
| * | | Introduce and Switch to mikepenz/MaterialDrawervectorijk2015-04-243-25/+144
| |/ /
* | | fix encrypt activity layoutVincent Breitmoser2015-04-242-3/+4
| | |
* | | revamp decrypt uiVincent Breitmoser2015-04-247-230/+391
|/ /
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-04-228-30/+449
|\ \ | | | | | | | | | development
| * | Fixed Snackbar behind layoutManoj Khanna2015-04-225-29/+29
| | | | | | | | | | | | Surrounded string with quotes
| * | keyserver verification on additionAdithya Abraham Philip2015-04-224-1/+420
| | |
* | | Update changelogDominik Schürmann2015-04-221-6/+8
|/ /
* | 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-2110-52/+212
|\ \ | | | | | | | | | development