aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* Prepare decrypt UI for input parcelDominik Schürmann2015-03-312-124/+58
* Better check if file is already addedDominik Schürmann2015-03-311-19/+42
* Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychai...Dominik Schürmann2015-03-313-2/+16
|\
| * work on passphrase data flowVincent Breitmoser2015-03-313-2/+16
* | Simplify passphrase dialog designDominik Schürmann2015-03-311-2/+3
|/
* Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychai...Vincent Breitmoser2015-03-306-120/+332
|\
| * 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
|\
| * rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-304-392/+400
* | 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
* | 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 showMult...iseki2015-03-261-26/+33
| * 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
|\|
| * Pull from transifexDominik Schürmann2015-03-233-10/+10
| * Merge pull request #1166 from adithyaphilip/multi-threadedDominik Schürmann2015-03-2316-84/+239
| |\
| | * shifted multi-threading to own serviceAdithya Abraham Philip2015-03-2316-98/+165
| | * introduced multi-threadingAdithya Abraham Philip2015-03-231-0/+88
| * | Merge pull request #1174 from Jesperbk/developmentDominik Schürmann2015-03-231-1/+3
| |\ \ | | |/ | |/|
| | * Fixed issue where setting a passphrase to null later causes a NullPointerExce...JesperBK2015-03-231-1/+3
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-231-14/+23
| |\ \
| * | | 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
* | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-2117-176/+163
|\|
| * 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