aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-2424-142/+299
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
| * Pull from transifexDominik Schürmann2015-03-233-10/+10
| |
| * Merge pull request #1166 from adithyaphilip/multi-threadedDominik Schürmann2015-03-2316-84/+239
| |\ | | | | | | Multi-threaded key import, update all feature
| | * shifted multi-threading to own serviceAdithya Abraham Philip2015-03-2316-98/+165
| | | | | | | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import
| | * introduced multi-threadingAdithya Abraham Philip2015-03-231-0/+88
| | | | | | | | | | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor
| * | Merge pull request #1174 from Jesperbk/developmentDominik Schürmann2015-03-231-1/+3
| |\ \ | | |/ | |/| Fixed symmetric encryption crash
| | * Fixed issue where setting a passphrase to null later causes a ↵JesperBK2015-03-231-1/+3
| | | | | | | | | | | | NullPointerException.
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-231-14/+23
| |\ \ | | | | | | | | | | | | development
| * | | Use markdown for in-app helpDominik Schürmann2015-03-233-17/+41
| | |/ | |/|
* | | further improve yubikey error handlingVincent Breitmoser2015-03-232-18/+39
| | |
* | | nicer handling of nfc errorsVincent Breitmoser2015-03-231-5/+8
| | |
* | | Merge branch 'development' into v/crypto-input-parcelVincent Breitmoser2015-03-221-14/+23
|\ \ \ | | |/ | |/|
| * | use top line in snackbar for status indicationVincent Breitmoser2015-03-221-14/+23
| |/
* | enable nfc in import dialog as wellVincent Breitmoser2015-03-223-5/+49
| |
* | finish ui flow for yubikey importVincent Breitmoser2015-03-226-197/+329
| |
* | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-221-8/+9
| |
* | improve status reporting in yubikey dialogueVincent Breitmoser2015-03-221-11/+102
| |
* | move yubikey import into viewkeyfragmentVincent Breitmoser2015-03-226-158/+259
| |
* | split up wait/action yubikey fragmentsVincent Breitmoser2015-03-214-64/+137
| |
* | work on ad-hoc yubikey import supportVincent Breitmoser2015-03-213-18/+270
| |
* | first steps toward yubikey activityVincent Breitmoser2015-03-2124-445/+585
| | | | | | | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity
* | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-2117-176/+163
|\| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| * Added docs for Notify classManoj Khanna2015-03-201-0/+10
| |
| * Fixed Snackbar behind keyboard on ImportKeysActivityManoj Khanna2015-03-201-4/+9
| |
| * Reworked Notify classManoj Khanna2015-03-2017-173/+130
| |
| * Merge pull request #1163 from kentnek/dev-list-footerDominik Schürmann2015-03-201-2/+17
| |\ | | | | | | Added a blank footer view to the list of keys
| | * - Added footer so that the Floating Action Button won't block the last few ↵Kent2015-03-201-2/+17
| | | | | | | | | | | | items' content
* | | more data in RequiredInputParcel, OperationResult notificationsVincent Breitmoser2015-03-211-13/+47
| | | | | | | | | | | | | | | - pass both masterkeyid and subkeyid though RequiredInputParcel parcel - fix numeric vales in OperationResult.createNotify()
* | | fix more unit tests (syntax)Vincent Breitmoser2015-03-201-1/+2
| | |
* | | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-2026-500/+498
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
| * | Implemented #1162: Invoke NFC in Advanced ViewKent2015-03-202-154/+36
| |/ | | | | | | | | | | | | - Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes - Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks - Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment. - Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement)
| * Remove on click on iconDominik Schürmann2015-03-191-0/+2
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-192-45/+81
| |\ | | | | | | | | | development
| | * Fix for Issue #1114Manoj Khanna2015-03-191-5/+30
| | | | | | | | | | | | Displays the snackbar above the keyboard on all activities.
| | * Fixed a crash on ViewKeyActivityManoj Khanna2015-03-191-40/+51
| | | | | | | | | | | | | | | This occurs when deleting a key with a stripped master key from the ViewKeyActivity.
| * | Manage my keys wizardDominik Schürmann2015-03-1911-263/+323
| |/
| * New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-1917-65/+81
| |
* | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-205-89/+37
| |
* | generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-195-43/+54
| |
* | yubikey certifications!Vincent Breitmoser2015-03-183-62/+117
| |
* | generalize nfc crypto input structureVincent Breitmoser2015-03-184-24/+519
| |
* | introduce CryptoOperationParcel for nfc dataVincent Breitmoser2015-03-181-1/+3
|/
* File extensions into ConstantsDominik Schürmann2015-03-174-13/+15
|
* Allow for hidden recipients in encrypt methodsDominik Schürmann2015-03-163-8/+36
|
* Allow encrypt of filenames via overflow menuDominik Schürmann2015-03-164-6/+27
|
* object oriented split user idDominik Schürmann2015-03-1620-88/+84
|
* Fix nullpointer when scanning malformed qr codesDominik Schürmann2015-03-161-1/+1
|
* Clarify MIME usageDominik Schürmann2015-03-152-2/+2
|
* Remove display of key id in other listsDominik Schürmann2015-03-153-18/+65
|
* Show main user id instead of key in certify screenDominik Schürmann2015-03-151-10/+15
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 08:23:47 +0000