aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
Commit message (Collapse)AuthorAgeFilesLines
* Pass imported master key ids via result parcelDominik Schürmann2014-10-043-44/+48
|
* Fixing import, start qr code stuffDominik Schürmann2014-10-041-50/+116
|
* Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵Vincent Breitmoser2014-10-048-33/+593
|\ | | | | | | into jacobshack-certify
| * Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵Dominik Schürmann2014-10-049-288/+634
| |\ | | | | | | | | | into jacobshack-certify
| * | 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
| | |
* | | improve CertifyResult, add custom notifyVincent Breitmoser2014-10-044-5/+102
| |/ |/|
* | redesign certify action to work with parcel input and resultVincent Breitmoser2014-10-049-42/+370
| |
* | keychainintentservice: rearrange actions in alphabetical orderVincent Breitmoser2014-10-041-263/+281
|/
* canonicalize: compare user ids as string rather than bytesVincent Breitmoser2014-10-041-3/+3
|
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-10-031-1/+1
|\
| * Fix string referenceDominik Schürmann2014-10-031-1/+1
| |
* | 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
|
* one more fix for getting the right subkey in api signingVincent Breitmoser2014-10-031-19/+19
|
* forgot adjustments in ProviderHelperVincent Breitmoser2014-10-031-4/+5
|
* 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-0315-122/+80
| |\ | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
| * | Fix nullpointer with clipboardDominik Schürmann2014-10-032-10/+9
| | |
* | | clean up PgpImportExport a bitVincent Breitmoser2014-10-031-7/+5
| | |
* | | move IteratorWithSize interface into ParcelableFileCache - much cleanerVincent Breitmoser2014-10-034-20/+25
| | |
* | | actually use iterator interface for ParcelableFileCache in activitiesVincent Breitmoser2014-10-034-19/+52
| | |
* | | get rid of two consolidate number preferencesVincent Breitmoser2014-10-034-52/+31
| | |
* | | use iterator interface exclusively in ParcelableFileCacheVincent Breitmoser2014-10-034-19/+21
| |/ |/|
* | 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
| |
* | make getSignId a secret key operation, and respect unavailable keysVincent Breitmoser2014-10-028-112/+38
|/ | | | This one should remedy #811, but waiting for a test
* mProgressDialogFragment null checkDominik Schürmann2014-10-021-0/+5
|
* Remove unnecessary call to mFingerprintQrCodeDominik Schürmann2014-10-021-2/+0
|
* Fix IllegalStateException in ViewKeyShareFragmentDominik Schürmann2014-10-021-11/+14
|
* Fix nullpointer with getS2K()Dominik Schürmann2014-10-021-1/+2
|
* 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-014-25/+79
|
* check key ids when used from apiDominik Schürmann2014-10-011-6/+8
|
* 3.0 beta3Dominik Schürmann2014-09-301-4/+7
|
* fix minor logic error (haha)Vincent Breitmoser2014-09-301-1/+1
|
* fix ByteBuffer offset mistake in NfcActivityVincent Breitmoser2014-09-301-1/+2
|
* pass (encryption) key id from Decrypt*Fragment to NfcActivityVincent Breitmoser2014-09-306-20/+42
|
* pass key id for check from EncryptActivity to NfcActivityVincent Breitmoser2014-09-303-4/+13
|
* add (optional) keyId check in NfcActivityVincent Breitmoser2014-09-301-5/+20
|
* revamp fingerprint and keyid methods in NfcActivityVincent Breitmoser2014-09-301-18/+47
|
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-305-10/+15
|\
| * Fix nullpointer in DecryptActivityDominik Schürmann2014-09-291-4/+8
| |
| * Fixes for share to decryptDominik Schürmann2014-09-292-4/+5
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 02:41:12 +0000