aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵Vincent Breitmoser2014-10-056-11/+40
|\ | | | | | | | | | | | | into jacobshack-certify Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java
| * preselect certify keyDominik Schürmann2014-10-056-14/+35
| |
| * Display result in multi certifyDominik Schürmann2014-10-043-1/+9
| |
* | more layout neatificationVincent Breitmoser2014-10-053-4/+22
| |
* | slight layout changes to keyspinner_itemVincent Breitmoser2014-10-053-7/+6
|/
* Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵Vincent Breitmoser2014-10-043-137/+141
|\ | | | | | | into jacobshack-certify
| * use new multi certify, layout fixesDominik Schürmann2014-10-043-137/+141
| |
* | merge key ids in getSelectedCertifyActionsVincent Breitmoser2014-10-042-24/+28
|/
* Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵Vincent Breitmoser2014-10-0413-206/+378
|\ | | | | | | into jacobshack-certify
| * add dividerDominik Schürmann2014-10-042-3/+7
| |
| * qr code download, cleanupDominik Schürmann2014-10-042-117/+63
| |
| * Workings on new parcel for key downloadsDominik Schürmann2014-10-048-86/+212
| |
| * Pass imported master key ids via result parcelDominik Schürmann2014-10-045-51/+87
| |
| * Fixing import, start qr code stuffDominik Schürmann2014-10-041-50/+116
| |
* | implement preliminary MultiCertifyActivity (most heavy lifting is done)Vincent Breitmoser2014-10-0410-9/+822
| |
* | certify: get rid of fingerprint checkVincent Breitmoser2014-10-045-16/+6
|/ | | | | | 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 ↵Vincent Breitmoser2014-10-0412-42/+751
|\ | | | | | | into jacobshack-certify
| * Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵Dominik Schürmann2014-10-0410-289/+653
| |\ | | | | | | | | | into jacobshack-certify
| * | Import code, fix collision of key spinner with other loadersDominik Schürmann2014-10-047-46/+321
| | |
| * | New add keys activityDominik Schürmann2014-10-048-13/+447
| | |
* | | improve CertifyResult, add custom notifyVincent Breitmoser2014-10-0415-26/+140
| |/ |/|
* | redesign certify action to work with parcel input and resultVincent Breitmoser2014-10-0410-43/+389
| |
* | 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-0336-72/+165
|\
| * Make app_name translatableDominik Schürmann2014-10-032-6/+2
| |
| * Version 3.0.1Dominik Schürmann2014-10-031-2/+2
| |
| * Fix string referenceDominik Schürmann2014-10-031-1/+1
| |
| * Pull from transifexDominik Schürmann2014-10-0331-63/+154
| |
| * ChangelogDominik Schürmann2014-10-031-0/+6
| |
* | 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-035-56/+32
| | |
* | | 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
* Version 3.0Dominik Schürmann2014-10-021-2/+2
|
* mProgressDialogFragment null checkDominik Schürmann2014-10-021-0/+5
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 10:41:57 +0000