aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
...
* | even more layout neatificationVincent Breitmoser2014-10-051-0/+1
|/
* Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵Vincent Breitmoser2014-10-054-7/+36
|\ | | | | | | | | | | | | into jacobshack-certify Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java
| * preselect certify keyDominik Schürmann2014-10-054-10/+31
| |
| * Display result in multi certifyDominik Schürmann2014-10-043-1/+9
| |
* | more layout neatificationVincent Breitmoser2014-10-051-1/+1
| |
* | slight layout changes to keyspinner_itemVincent Breitmoser2014-10-051-1/+1
|/
* Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵Vincent Breitmoser2014-10-041-2/+2
|\ | | | | | | into jacobshack-certify
| * use new multi certify, layout fixesDominik Schürmann2014-10-041-2/+2
| |
* | merge key ids in getSelectedCertifyActionsVincent Breitmoser2014-10-042-24/+28
|/
* Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵Vincent Breitmoser2014-10-046-181/+221
|\ | | | | | | into jacobshack-certify
| * add dividerDominik Schürmann2014-10-041-3/+1
| |
| * qr code download, cleanupDominik Schürmann2014-10-041-116/+62
| |
| * Workings on new parcel for key downloadsDominik Schürmann2014-10-045-74/+125
| |
| * Pass imported master key ids via result parcelDominik Schürmann2014-10-041-39/+24
| |
| * Fixing import, start qr code stuffDominik Schürmann2014-10-041-50/+116
| |
* | implement preliminary MultiCertifyActivity (most heavy lifting is done)Vincent Breitmoser2014-10-043-0/+599
| |
* | certify: get rid of fingerprint checkVincent Breitmoser2014-10-041-4/+3
|/ | | | | | Master key ids are unambiguous by database design, and only keys which are in the database are signed. There is no reason to check the fingerprint again during the certify operation.
* Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵Dominik Schürmann2014-10-041-13/+16
|\ | | | | | | into jacobshack-certify
| * redesign certify action to work with parcel input and resultVincent Breitmoser2014-10-041-13/+16
| |
* | Import code, fix collision of key spinner with other loadersDominik Schürmann2014-10-046-45/+320
| |
* | New add keys activityDominik Schürmann2014-10-044-4/+289
|/
* fix nullpointer on button push while data is still loadingVincent Breitmoser2014-10-031-0/+3
| | | | fixes #934
* Null check for getSelectedEntriesDominik Schürmann2014-10-031-1/+7
|
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-10-034-11/+10
|\
| * More beautifyKeyIdWithPrefixDominik Schürmann2014-10-032-3/+2
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-10-037-10/+42
| |\ | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
| * | Fix nullpointer with clipboardDominik Schürmann2014-10-032-10/+9
| | |
* | | move IteratorWithSize interface into ParcelableFileCache - much cleanerVincent Breitmoser2014-10-032-7/+3
| | |
* | | actually use iterator interface for ParcelableFileCache in activitiesVincent Breitmoser2014-10-033-18/+47
| | |
* | | use iterator interface exclusively in ParcelableFileCacheVincent Breitmoser2014-10-031-1/+1
| |/ |/|
* | more getActivity() checksVincent Breitmoser2014-10-031-2/+11
| |
* | fix nullpointer with subtle attention seekerVincent Breitmoser2014-10-031-8/+9
| |
* | fix hideKeyboard() in other activities as well, just to be safeVincent Breitmoser2014-10-024-0/+12
| |
* | fix NullPointerException in keyboard hackVincent Breitmoser2014-10-021-1/+10
|/
* Remove unnecessary call to mFingerprintQrCodeDominik Schürmann2014-10-021-2/+0
|
* Fix IllegalStateException in ViewKeyShareFragmentDominik Schürmann2014-10-021-11/+14
|
* code styleDominik Schürmann2014-10-021-5/+5
|
* Add null check when retrieving key ids from contacts apiDominik Schürmann2014-10-021-0/+7
|
* Add workaround for bug #912Dominik Schürmann2014-10-021-0/+7
|
* Fix decrypt/verify from gmail/aosp mail with sharing intent, fix scrolling ↵Dominik Schürmann2014-10-012-16/+27
| | | | in decryt screen
* More debugging outputDominik Schürmann2014-10-011-0/+4
|
* fix ByteBuffer offset mistake in NfcActivityVincent Breitmoser2014-09-301-1/+2
|
* pass (encryption) key id from Decrypt*Fragment to NfcActivityVincent Breitmoser2014-09-304-17/+33
|
* pass key id for check from EncryptActivity to NfcActivityVincent Breitmoser2014-09-301-2/+3
|
* add (optional) keyId check in NfcActivityVincent Breitmoser2014-09-301-5/+20
|
* revamp fingerprint and keyid methods in NfcActivityVincent Breitmoser2014-09-301-18/+47
|
* Fix nullpointer in DecryptActivityDominik Schürmann2014-09-291-4/+8
|
* Fixes for share to decryptDominik Schürmann2014-09-292-4/+5
|
* Maybe fixes encrypt files on tabletsDominik Schürmann2014-09-292-2/+2
|
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-09-293-5/+2
|\ | | | | | | | | Conflicts: OpenKeychain/src/main/AndroidManifest.xml
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 22:45:35 +0000