aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
* work on LinkedIdViewFragmentVincent Breitmoser2015-03-053-15/+144
|
* make linked identity list homogeneousVincent Breitmoser2015-03-052-78/+48
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0533-253/+458
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * Merge pull request #1101 from danielnelz/developmentDominik Schürmann2015-03-0413-70/+85
| |\ | | | | | | #1042 replaced some int constants with enums
| | * #1042 replaced some int constants with enumsDaniel Nelz2015-03-0413-70/+85
| | | | | | | | | | | | | | | Created enum FragAction in CreateKeyActivity.java and enum State in KeyFormattingUtils.java and replaced int constants with them
| * | Show fingerprint menu item only if not revoked or expiredDominik Schürmann2015-03-041-9/+12
| | |
| * | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵Dominik Schürmann2015-03-041-2/+196
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml
| | * | corrected code styleAdithya Abraham Philip2015-03-041-58/+75
| | | |
| | * | supports sub logs in log exportAdithya Abraham Philip2015-03-011-68/+55
| | | |
| | * | added logging, notify for log exportAdithya Abraham Philip2015-03-011-20/+52
| | | |
| | * | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-02-284-37/+113
| | |\ \ | | | | | | | | | | | | | | | into development
| | * \ \ Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-02-2813-379/+361
| | |\ \ \ | | | | | | | | | | | | | | | | | | into development
| | * | | | cleaned up log exportAdithya Abraham Philip2015-02-281-20/+9
| | | | | |
| | * | | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-02-2812-412/+582
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into development
| | * | | | | refined log outputAdithya Abraham Philip2015-02-281-4/+71
| | | | | | |
| | * | | | | merged dialogAdithya Abraham Philip2015-02-2635-365/+1711
| | |\ \ \ \ \
| | * | | | | | initial Log Display functionAdithya Abraham Philip2015-02-261-0/+102
| | | | | | | |
| * | | | | | | More icon naming fixes and designDominik Schürmann2015-03-042-16/+16
| | | | | | | |
| * | | | | | | Simplified language: Confirm keysDominik Schürmann2015-03-041-15/+4
| | | | | | | |
| * | | | | | | Get high res version of contact photoDominik Schürmann2015-03-042-2/+2
| | | | | | | |
| * | | | | | | Crop image view to centerDominik Schürmann2015-03-041-3/+2
| | | | | | | |
| * | | | | | | Full height contact pic in key viewDominik Schürmann2015-03-041-7/+1
| | | | | | | |
| * | | | | | | Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED ↵Dominik Schürmann2015-03-048-33/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of EXPIRY where possible
| * | | | | | | Simplify dialogs according to Material DesignDominik Schürmann2015-03-042-13/+9
| | | | | | | |
| * | | | | | | Merge branch 'development' of https://github.com/vectorijk/open-keychain ↵Dominik Schürmann2015-03-032-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into vectorijk-development
| | * | | | | | | icon name changes in UI filesjiangkai2015-03-032-2/+2
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Show name only in passphrase dialogDominik Schürmann2015-03-032-1/+25
| | | | | | | |
| * | | | | | | Fix expiry dialog, reorder layoutsDominik Schürmann2015-03-033-44/+47
| | | | | | | |
| * | | | | | | Prettify passphrase dialog, it no longer resizes on unlocking the keyDominik Schürmann2015-03-031-24/+25
| |/ / / / / /
| * | | | | | Remove old min sdk checkDominik Schürmann2015-03-031-3/+1
| | | | | | |
| * | | | | | Merge pull request #1082 from ishan1604/bug-1081Dominik Schürmann2015-03-031-3/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixes Issue #1081
| | * | | | | | Fixes Issue #1081Ishan Khanna2015-03-031-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The App crashed because the Adapter was trying to call a method on a null object. Where was the null object? CheckBox was null because in the Layout file view_key_adv_user_id_item.xml There is no such widget with id = user_id_item_check_box Fix : I removed the two lines which were causing the bug, and now the screen loads perfectly.
| * | | | | | | Revert "rescale qr code bitmap in background"Dominik Schürmann2015-03-031-6/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size of view may not be available in background thread. This reverts commit 7e4c39c79d1adb58f3181c9674309b1faaecc864.
| * | | | | | rescale qr code bitmap in backgroundVincent Breitmoser2015-03-021-7/+6
| | | | | | |
* | | | | | | do a TON of UI workVincent Breitmoser2015-03-0511-95/+215
| | | | | | |
* | | | | | | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-0411-30/+213
| | | | | | |
* | | | | | | remove unused bits from projectionVincent Breitmoser2015-03-021-15/+1
| | | | | | |
* | | | | | | add linked it to view key context menuVincent Breitmoser2015-03-022-0/+19
| | | | | | |
* | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-025-258/+303
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
| * | | | | | forgot to rename a methodVincent Breitmoser2015-03-022-4/+2
| | | | | | |
| * | | | | | some cleanup in ViewKey*Vincent Breitmoser2015-03-022-18/+20
| | | | | | |
| * | | | | | don't reload qr code for identical fingerprintVincent Breitmoser2015-03-021-1/+5
| | | | | | |
| * | | | | | make userattributeadapter superclass of useridsadapterVincent Breitmoser2015-03-024-115/+143
| | | | | | |
* | | | | | | some fixes for compiling (still not working!)Vincent Breitmoser2015-03-024-25/+10
| | | | | | |
* | | | | | | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0290-3255/+3995
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java 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/service/SaveKeyringParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java OpenKeychain/src/main/res/layout/view_key_main_fragment.xml OpenKeychain/src/main/res/values/strings.xml extern/spongycastle
| * | | | | | fix a couple lint errorsVincent Breitmoser2015-02-282-4/+5
| | |_|_|_|/ | |/| | | |
| * | | | | some changes to qr scan logicVincent Breitmoser2015-02-284-37/+113
| | |_|_|/ | |/| | |
| * | | | pass through messenger to certify service from ViewKeyActivityVincent Breitmoser2015-02-284-49/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the idea here is to handle progress and result of the CertifyActivity directly in ViewKeyActivity by passing a messenger through to it. this allows smoother transition from an uncertified to certified state.
| * | | | fab support for all notify typesVincent Breitmoser2015-02-281-23/+29
| | | | |
| * | | | small Notify cleanupVincent Breitmoser2015-02-281-24/+2
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 15:12:04 +0000