aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Commit message (Collapse)AuthorAgeFilesLines
* move key deletion into KeychainIntentHandlerVincent Breitmoser2014-08-201-2/+6
|
* return some more resultsDominik Schürmann2014-08-201-0/+1
|
* Optimize importsDominik Schürmann2014-08-051-2/+1
|
* Fix nullpointer, remove unused window featureDominik Schürmann2014-08-041-1/+0
|
* Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-041-1/+1
|
* Merge branch 'master' into improve-file-moremar-v-in2014-08-011-58/+17
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
| * Use darker colorsDominik Schürmann2014-08-011-4/+4
| |
| * move upload/update buttons from menu to buttonsVincent Breitmoser2014-07-311-30/+0
| |
| * fix bug in UploadKeyActivity, minor work on uri handlingVincent Breitmoser2014-07-311-24/+13
| |
* | Merge branch 'master' into improve-file-moremar-v-in2014-07-311-42/+46
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
| * Robots like coffee too...Dominik Schürmann2014-07-311-4/+4
| |
| * Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-291-23/+10
| |\ | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
| | * introduce EditKeyResult with transient UncachedKeyRing (half-baked!)Vincent Breitmoser2014-07-271-1/+1
| | |
| | * some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-271-2/+0
| | |
| | * use SuperToast instead of AppMsg in code, part 1Vincent Breitmoser2014-07-071-21/+10
| | |
| * | Use new icons in other key related activites, delete old iconsDominik Schürmann2014-07-281-1/+1
| | |
| * | Set visibility at lastDominik Schürmann2014-07-281-3/+3
| | |
| * | Use icons in key viewDominik Schürmann2014-07-281-19/+36
| |/
* | Merge branch 'master' into improve-file-moremar-v-in2014-07-011-2/+6
|\| | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
| * work on edit keyDominik Schürmann2014-06-301-2/+1
| |
| * pass import results through to viewkeyactivity on updateVincent Breitmoser2014-06-281-2/+6
| |
* | Improve file more, Part 1mar-v-in2014-06-221-3/+1
|/ | | | | | | | | | | | | | | - Use Uris where it makes sense, Use File class to clarify it's a file (and not whatever else a string could be) - Show sdcard in side menu in storage API #665 - Propose filename with gpg ending when storing it using the storage API #665 - Don't show output dialog on Android 4.4 #665 - Only show filename on Android < 4.4 #665 TODO: - File deletion for Android < 4.4 - Testing (especially with Android < 4.4) - Batch-encryption - UI - Temporary content provider (see #665 discussion)
* 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-181-1/+1
|/
* Merge pull request #649 from mar-v-in/automatic-contact-discoveryDominik Schürmann2014-06-061-1/+12
|\ | | | | Automatic contact discovery and more
| * Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-051-2/+2
| |\ | | | | | | | | | | | | | | | 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.
* | | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackageDominik Schürmann2014-06-061-1/+1
| | |
* | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide themDominik Schürmann2014-06-061-10/+77
| |/ |/|
* | neatness refactoringVincent Breitmoser2014-06-041-2/+2
|/
* Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-141-117/+157
|\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml
| * GET_KEY: also return PendingIntent to key viewDominik Schürmann2014-05-071-1/+1
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-071-0/+31
| |\
| | * small fix for 6aafb3, forgot to commit this lineVincent Breitmoser2014-05-071-0/+1
| | |
| | * ui: slight edit icon cosmetics in keylistVincent Breitmoser2014-05-071-0/+4
| | |
| | * ui: move revocation/expiry notes above tab sliderVincent Breitmoser2014-05-071-0/+26
| | |
| * | Clarify languageDominik Schürmann2014-05-071-1/+1
| |/
| * New key view design, using Android flat buttons and Android iconsDominik Schürmann2014-05-051-116/+125
| |
* | wrapped-key-ring: remove more unneeded methodsVincent Breitmoser2014-05-041-4/+4
|/
* Fix more stringsDominik Schürmann2014-04-191-1/+1
|
* NotFoundExceptions for all getGeneric-type methodsVincent Breitmoser2014-04-171-40/+48
|
* Remove some Ids...Dominik Schürmann2014-04-111-7/+4
|
* Refactor ProviderHelper to be non-static using a constructor based on ↵Dominik Schürmann2014-04-111-18/+21
| | | | context (first commit to get context out of pgp classes)
* get rid of more getMasterKeyId usage, work on getKeyRingsAsArmoredStringVincent Breitmoser2014-04-111-11/+13
|
* Disable selection of user ids and keys in view keyDominik Schürmann2014-04-101-2/+2
|
* Minimize use of class variables in ViewKeyDominik Schürmann2014-04-101-6/+6
|
* Cleanup AsyncTask code for NFCDominik Schürmann2014-04-101-6/+8
|
* Cleanup importsDominik Schürmann2014-04-101-2/+0
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-04-101-7/+8
|\
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 21:16:21 +0000