aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
* Cleanup FoldableLinearLayoutDominik Schürmann2014-08-271-6/+4
* API: Fix re-seletion of keys on default accountDominik Schürmann2014-08-232-9/+16
* Fix contact syncDominik Schürmann2014-08-221-5/+5
* Revert "No need for setSyncAutomatically, this is only for network tickles"Dominik Schürmann2014-08-221-0/+1
* Add info about device with intent chooser bugDominik Schürmann2014-08-211-1/+1
* Disable custom intent chooserDominik Schürmann2014-08-211-53/+54
* Fix nullpointer when revoking keysDominik Schürmann2014-08-211-1/+2
* Add account only on jelly bean and aboveDominik Schürmann2014-08-212-8/+15
* No need for setSyncAutomatically, this is only for network ticklesDominik Schürmann2014-08-211-3/+5
* Change account typeDominik Schürmann2014-08-214-7/+10
* cleanupDominik Schürmann2014-08-211-71/+0
* Fix result handling in account settingsDominik Schürmann2014-08-212-16/+13
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-213-40/+68
|\
| * Comment extra in requestSyncDominik Schürmann2014-08-201-0/+1
| * Sync in KeychainIntentService on delete, import, saveDominik Schürmann2014-08-202-0/+21
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-207-50/+130
| |\
| * | Enable sync adapter, changelogDominik Schürmann2014-08-202-2/+7
| * | Disable key import in sync adapterDominik Schürmann2014-08-201-38/+39
* | | Copyright (C) 2014 Vincent BreitmoserVincent Breitmoser2014-08-2131-2/+31
| |/ |/|
* | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-204-13/+8
|\|
| * Upload key workingDominik Schürmann2014-08-204-13/+8
* | small change to make android studio recognize a honeycomb-only blockVincent Breitmoser2014-08-201-2/+4
* | move key deletion into KeychainIntentHandlerVincent Breitmoser2014-08-203-40/+103
* | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-207-33/+49
|\|
| * Upload key workingDominik Schürmann2014-08-201-0/+3
| * Fix key sharingDominik Schürmann2014-08-201-3/+1
| * Work on upload keyDominik Schürmann2014-08-201-14/+24
| * Notify duration, cleanupDominik Schürmann2014-08-202-9/+4
| * Fix nullpointer in first time activityDominik Schürmann2014-08-201-1/+3
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-201-1/+1
| |\
| * | return some more resultsDominik Schürmann2014-08-202-6/+14
* | | consolidate: small ui thingsVincent Breitmoser2014-08-201-0/+4
* | | make number of secret keys imported part of ImportResult parcelVincent Breitmoser2014-08-202-5/+11
* | | close actionmode in keylist on loading events (avoid inconsistent state)Vincent Breitmoser2014-08-201-0/+10
* | | consolidate: remove debug "breakpoint"Vincent Breitmoser2014-08-201-5/+0
| |/ |/|
* | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-202-9/+7
|\|
| * progress dialog design fixDominik Schürmann2014-08-202-9/+7
* | modifyKey: small logging changesVincent Breitmoser2014-08-201-1/+1
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-203-90/+113
|\
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-206-18/+29
| |\
| * | consolidate: prevent concurrent calls of step 2Vincent Breitmoser2014-08-203-90/+113
* | | return some more resultsDominik Schürmann2014-08-206-35/+41
| |/ |/|
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-207-53/+73
|\|
| * consolidate: implement (mostly) recovery modeVincent Breitmoser2014-08-204-48/+66
| * consolidate: use KeychainProvider for deletion operationVincent Breitmoser2014-08-204-5/+7
* | Fixes and temporary fixes for returning resultsDominik Schürmann2014-08-206-18/+29
|/
* Fix mime types, #781mar-v-in2014-08-191-1/+1
* Fix stringsDominik Schürmann2014-08-192-3/+3
* consolidate: a lot more log output, better recoveryVincent Breitmoser2014-08-193-30/+85
* Start consolidate activityDominik Schürmann2014-08-191-1/+8
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 03:23:00 +0000