aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | 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.
| * | | | | | | | Cleanup of contact sync, debuggingDominik Schürmann2015-03-032-94/+126
| |/ / / / / / /
| * | | | | | | rescale qr code bitmap in backgroundVincent Breitmoser2015-03-021-7/+6
| | | | | | | |
* | | | | | | | small fixes to the matcherVincent Breitmoser2015-03-051-5/+2
| | | | | | | |
* | | | | | | | fixed length identifiersVincent Breitmoser2015-03-052-7/+4
| | | | | | | |
* | | | | | | | do a TON of UI workVincent Breitmoser2015-03-0522-246/+456
| | | | | | | |
* | | | | | | | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-0419-226/+408
| | | | | | | |
* | | | | | | | remove unused bits from projectionVincent Breitmoser2015-03-021-15/+1
| | | | | | | |
* | | | | | | | nonce is 4 bytesVincent Breitmoser2015-03-021-9/+9
| | | | | | | |
* | | | | | | | add linked it to view key context menuVincent Breitmoser2015-03-022-0/+19
| | | | | | | |
* | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-027-279/+323
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | |
| * | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2015-03-021-7/+20
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | development
| | * | | | | | Use index constants in ContactHelperDominik Schürmann2015-03-021-7/+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-02160-5274/+7662
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | |
| * | | | clean up warnings in KeyListFragmentVincent Breitmoser2015-02-281-32/+10
| | | | |
| * | | | collapse fab on action selectedVincent Breitmoser2015-02-281-0/+3
| | | | | | | | | | | | | | | | | | | | closes #1057
| * | | | animate FAB to move up and down when a snackbar appearsVincent Breitmoser2015-02-281-11/+10
| | | | |
| * | | | forgot to commit FabContainerVincent Breitmoser2015-02-281-0/+8
| | | | |
| * | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-02-283-4/+85
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
| | * | | | control flow for moving the fab up with snackbarVincent Breitmoser2015-02-283-5/+85
| | | | | |
| * | | | | Update from transifexDominik Schürmann2015-02-281-2/+0
| |/ / / /
| * | | | Simplify MainActivityDominik Schürmann2015-02-282-52/+23
| | | | |
| * | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-02-272-5/+32
| |\ \ \ \ | | | | | | | | | | | | | | | | | | development
| | * \ \ \ Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2015-02-274-172/+9
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | development
| | * | | | | slightly longer color fade durationVincent Breitmoser2015-02-271-3/+3
| | | | | | |
| | * | | | | transition status color in key viewVincent Breitmoser2015-02-271-3/+30
| | | | | | |
| | * | | | | hand through result in CertifyFingerprintActivityVincent Breitmoser2015-02-271-2/+2
| | | | | | |
| * | | | | | Reorder advanced key viewDominik Schürmann2015-02-272-59/+7
| | |/ / / / | |/| | | |
| * | | | | Enable multi line snackbar optionDominik Schürmann2015-02-271-1/+5
| | | | | |
| * | | | | Remove swipte to refresh src, fix padding in key listDominik Schürmann2015-02-272-167/+0
| | | | | |
| * | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-02-272-8/+131
| |\| | | | | | | | | | | | | | | | | | | | | | development
| | * | | | show refresh key progress inlineVincent Breitmoser2015-02-272-8/+131
| | | | | |
| * | | | | Fix status images in user id adapterDominik Schürmann2015-02-271-4/+4
| |/ / / /
| * | | / Keybase header textDominik Schürmann2015-02-271-2/+2
| | |_|/ | |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 10:12:48 +0000