aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v/crypto-input-parcel' of ↵Vincent Breitmoser2015-03-306-120/+332
|\ | | | | | | | | | | | | github.com:open-keychain/open-keychain into v/crypto-input-parcel Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
| * Dont show slinger button in spinnerDominik Schürmann2015-03-301-0/+2
| |
| * Use RecyclerView in EncryptFilesFragmentDominik Schürmann2015-03-305-121/+331
| |
* | remove unused NfcActivityVincent Breitmoser2015-03-302-574/+5
| |
* | fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-3011-281/+48
| |
* | pass CryptoInputParcel independently for SignEncryptOperationVincent Breitmoser2015-03-303-15/+8
|/
* Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-304-392/+400
|\ | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java
| * rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-304-392/+400
| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
* | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-291-12/+36
|\|
| * -Fixed a situation where additional emails could be duplicated when creating ↵Daniel Ramos2015-03-271-12/+36
| | | | | | | | a new key -If CreateKeyEmailFragment view is recreated, the array of additional emails won't be repopulated again if its not null, avoiding new reallocations. -if CreateKeyEmailFragment view is recreated, the email adapter wont be recreated if its not null, avoiding new reallocations.
* | Fixing crashes with new encrypt uiDominik Schürmann2015-03-293-32/+49
| |
* | Start reworking decrypt ui classesDominik Schürmann2015-03-273-172/+197
| |
* | Refactoring of EncryptTextActivityDominik Schürmann2015-03-278-400/+415
| |
* | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-261-14/+76
|\|
| * Modify break as return.iseki2015-03-261-1/+1
| |
| * Add brackets for if-else constructs and externalize the procedure as ↵iseki2015-03-261-26/+33
| | | | | | | | showMultiExportDialog.
| * Add a loop for multiple key export.iseki2015-03-251-13/+68
| |
* | Start refactoring encrypt ui, EncryptFileActivity no longer crashingDominik Schürmann2015-03-266-506/+531
| |
* | Fix certify with CryptoInputParcelDominik Schürmann2015-03-253-10/+6
| |
* | Remove backward compat in CertifyKeyFragmentDominik Schürmann2015-03-251-17/+1
| |
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 09:52:07 +0000