aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Daniel Ramos2015-04-2617-224/+533
|\ | | | | | | into development
| * 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
| |/
* | 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.
* | 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
| |
* | 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-205-37/+142
| |
* | 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-157-53/+45
| |
* | 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
|/
* Merge pull request #1193 from adithyaphilip/auto-refresh-contactsDominik Schürmann2015-04-131-21/+85
|\ | | | | Immediate display of contact card, fixed contact picture display issue, hides card if no contact
| * hide linked system contact card if no contact presentAdithya Abraham Philip2015-04-081-9/+23
| |
| * linked system contact auto-refresh added, fixed contact image issueAdithya Abraham Philip2015-04-081-20/+70
| |
* | IMplement CryptoInputParcelCacheServiceDominik Schürmann2015-04-132-8/+4
| |
* | Cache CryptoInputParcel in OpenPgpServiceDominik Schürmann2015-04-102-8/+10
| |
* | Fix nullpointer with Intent API, fix clearing of encrypt file list, notify ↵Dominik Schürmann2015-04-042-6/+7
| | | | | | | | when adding a range of input uris
* | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)Vincent Breitmoser2015-04-015-105/+25
| |
* | Prepare decrypt UI for input parcelDominik Schürmann2015-03-312-124/+58
| |
* | Better check if file is already addedDominik Schürmann2015-03-311-19/+42
| |
* | Merge branch 'v/crypto-input-parcel' of ↵Dominik Schürmann2015-03-313-2/+16
|\ \ | | | | | | | | | github.com:open-keychain/open-keychain into v/crypto-input-parcel
| * | work on passphrase data flowVincent Breitmoser2015-03-313-2/+16
| | |
* | | Simplify passphrase dialog designDominik Schürmann2015-03-311-2/+3
|/ /
* | Merge branch 'v/crypto-input-parcel' of ↵Vincent Breitmoser2015-03-306-120/+332
|\ \ | | | | | | | | | | | | | | | | | | github.com:open-keychain/open-keychain into v/crypto-input-parcel Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
| * | Dont show slinger button in spinnerDominik Schürmann2015-03-301-0/+2
| | |
| * | Use RecyclerView in EncryptFilesFragmentDominik Schürmann2015-03-305-121/+331
| | |
* | | remove unused NfcActivityVincent Breitmoser2015-03-302-574/+5
| | |
* | | fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-3011-281/+48
| | |
* | | pass CryptoInputParcel independently for SignEncryptOperationVincent Breitmoser2015-03-303-15/+8
|/ /
* | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-304-392/+400
|\| | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java