aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
* Fix qr code finallyDominik Schürmann2014-06-204-19/+31
|
* import: forward motion events to activity regardlessVincent Breitmoser2014-06-201-0/+12
|
* Work on Qr code importDominik Schürmann2014-06-205-43/+70
|
* Use actionbar button for log activityDominik Schürmann2014-06-202-4/+48
|
* Fix onTouchEvent delegation, with workaround for Android bugDominik Schürmann2014-06-201-6/+7
|
* Fix update from keyserver flowDominik Schürmann2014-06-202-5/+7
|
* Merge branch 'master' of https://github.com/open-keychain/open-keychain into ↵mar-v-in2014-06-196-243/+174
|\ | | | | | | improve-file
| * Fixing fingerprint search, part 1Dominik Schürmann2014-06-191-80/+88
| |
| * Remove unused code to import splitted qr codesDominik Schürmann2014-06-191-77/+1
| |
| * New callback model for ImportKeysActivityDominik Schürmann2014-06-196-99/+85
| |
| * forward touch events to pager in import activityVincent Breitmoser2014-06-181-0/+13
| |
* | Merge branch 'master' into improve-filemar-v-in2014-06-1815-350/+528
|\|
| * Merge branch 'new-edit'Vincent Breitmoser2014-06-182-10/+7
| |\ | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/res/values/strings.xml
| | * new-edit: remove old save keyring stuffVincent Breitmoser2014-06-172-10/+7
| | |
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-181-0/+13
| |\|
| | * add more progress info from import routineVincent Breitmoser2014-06-161-0/+13
| | |
| * | Redesign Import, still some todos and regression bugsDominik Schürmann2014-06-1810-322/+227
| |/
| * Moved Notify class to utilsDaniel Haß2014-06-162-71/+1
| |
| * Removed unused importDaniel Haß2014-06-161-1/+0
| |
| * Replaced AppMsg with notify wrapper callDaniel Haß2014-06-161-1/+4
| |
| * Added notification wrapper for toast like notifysDaniel Haß2014-06-161-0/+70
| |
| * Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-137-31/+643
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/res/values/strings.xml settings.gradle
| * | canonicalize: more stuffVincent Breitmoser2014-06-121-0/+2
| | |
| * | import-log: properly distinguish return statesVincent Breitmoser2014-06-121-3/+3
| | |
| * | import-log: use holder pattern in log fragmentVincent Breitmoser2014-06-111-16/+24
| | |
| * | import-log: work on log fragment uiVincent Breitmoser2014-06-102-14/+98
| | |
| * | import-log: switch to flags instead of statuses for result intVincent Breitmoser2014-06-101-46/+45
| | |
| * | import-log: more interface workVincent Breitmoser2014-06-102-17/+20
| | |
| * | import-log: some cosmeticsVincent Breitmoser2014-06-102-2/+3
| | |
| * | import-log: add LogDisplay activityVincent Breitmoser2014-06-103-4/+107
| | |
| * | import-log: use supertoast in ImportKeyActivityVincent Breitmoser2014-06-101-26/+87
| | |
* | | Delete using Document API (unsafe)mar-v-in2014-06-103-5/+43
| | |
* | | Use Document API on KitKat for file encrypt/decryptmar-v-in2014-06-103-53/+161
| | |
* | | Modify KeychainIntentService to support I/O with URIs, allow input and ↵mar-v-in2014-06-084-4/+4
| |/ |/| | | | | output to/from different types (eg. encrypt file and return byte array)
* | Merge pull request #649 from mar-v-in/automatic-contact-discoveryDominik Schürmann2014-06-062-4/+15
|\ \ | | | | | | Automatic contact discovery and more
| * \ Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-0522-72/+44
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * | | Show keys with android contactsmar-v-in2014-06-051-1/+12
| | | | | | | | | | | | | | | | This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid.
| * | | Make keylist case insensitivemar-v-in2014-06-051-3/+3
| | | | | | | | | | | | | | | | You want "michael" to be next to "Michael", don't you?
* | | | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackageDominik Schürmann2014-06-064-2/+531
| | | |
* | | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide themDominik Schürmann2014-06-062-10/+87
| |/ / |/| |
* | | Clean up keyimport.ImportKeysListEntryTim Bray2014-06-051-9/+8
| | |
* | | Merge pull request #645 from timbray/masterDominik Schürmann2014-06-051-6/+2
|\ \ \ | |_|/ |/| | Don't show full fingerprint in key search result lists
| * | Don't show full fingerprint in key search resultsTim Bray2014-06-051-6/+2
| | |
| * | fixed error messageTim Bray2014-06-041-3/+1
| |/
* | ui: do show Certify identities button even for secret keysVincent Breitmoser2014-06-041-8/+0
| | | | | | | | Closes #636
* | neatness refactoringVincent Breitmoser2014-06-0421-49/+34
|/
* Merge remote-tracking branch 'origin/master' into edit-key-rewriteVincent Breitmoser2014-06-023-29/+15
|\
| * Finished cleaning up rebase conflicts post Keyserver exception refactorTim Bray2014-05-233-9/+9
| |
| * Add Log.d for QueryFailedExceptionTim Bray2014-05-231-0/+2
| |
| * Add Log.d for QueryFailedExceptionTim Bray2014-05-233-25/+9
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 13:02:49 +0000