aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-102-4/+28
|\
| * select correct item in drawer on backstack change in main activityVincent Breitmoser2015-06-081-1/+25
| * prevent null fragments on activity deathAdithya Abraham Philip2015-06-031-3/+3
* | eventbus: initial attempt, replace messenger hack with eventbus communicationVincent Breitmoser2015-06-069-563/+330
|/
* Merge branch 'v/sticky-prefs'Vincent Breitmoser2015-06-034-32/+153
|\
| * keep prefernces individual per dialog (affects only compression)Vincent Breitmoser2015-06-032-5/+4
| * implement sticky preferencesVincent Breitmoser2015-05-314-32/+154
* | Partially revert "switch to native DialogFragment, fix some nullpointers", bu...Vincent Breitmoser2015-06-031-1/+2
* | hide invoke nfc button in android < 5Vincent Breitmoser2015-06-031-6/+11
* | renamed KeychainIntentService to KeychainServiceAdithya Abraham Philip2015-06-0121-170/+168
* | merged servicesAdithya Abraham Philip2015-06-0120-129/+87
* | switch to native DialogFragment, fix some nullpointersVincent Breitmoser2015-05-311-18/+24
* | revert some accidentally committed cruftVincent Breitmoser2015-05-311-8/+0
* | handle empty passphrases in PassphraseDialogActivityVincent Breitmoser2015-05-312-0/+34
|/
* prevent NaN dialog on import with no selected keysAdithya Abraham Philip2015-05-311-3/+7
* some decrypt/verify bug fixesVincent Breitmoser2015-05-301-2/+1
* rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcelVincent Breitmoser2015-05-304-16/+12
* show status indicators in EncryptFragmentVincent Breitmoser2015-05-301-0/+33
* rewrite data flow in EncryptFileFragment preserve state correctlyVincent Breitmoser2015-05-303-66/+87
* externalize caching functionality from CertifyKeyFragmentVincent Breitmoser2015-05-302-20/+75
* make KeyItem serializble, for state in TokenTextCompleteViewVincent Breitmoser2015-05-301-1/+3
* preserve state in DecryptFilesActivity/-FragmentVincent Breitmoser2015-05-292-37/+26
* preserve state in CertifyKeyFragmentVincent Breitmoser2015-05-292-30/+73
* Merge remote-tracking branch 'origin/master' into developmentVincent Breitmoser2015-05-287-38/+85
|\
| * respect cache in yubikey pin data flowVincent Breitmoser2015-05-282-6/+21
| * preserve state in DecryptTextActivityVincent Breitmoser2015-05-284-25/+55
| * shorten fp data to 20 bytes for convertFingerprintToHex in NfcBaseOperationVincent Breitmoser2015-05-281-7/+8
| * don't keep an activity reference in CreateKeyFinalFragmentVincent Breitmoser2015-05-281-25/+19
| * correctly preserve state in EncryptTextFragmentVincent Breitmoser2015-05-281-3/+15
| * correctly preserve state in EncryptFilesFragmentVincent Breitmoser2015-05-282-7/+38
| * move synchronous encryption into activity, and preserve checkbox stateVincent Breitmoser2015-05-283-15/+33
| * preserve state in KeySpinner, and some lint fixesVincent Breitmoser2015-05-284-20/+46
| * rewrite EncryptActivity data flowVincent Breitmoser2015-05-2810-477/+346
| * fix nullpointer in encrypttextactivity. fixes #1267Vincent Breitmoser2015-05-281-24/+18
| * highlight currently selected item in navigation drawerYoshi64Bit2015-05-281-10/+19
| * AssertionError instead of RuntimeExceptionDominik Schürmann2015-05-281-1/+1
| * Change convertFingerprintToHex to use RuntimeExceptionDominik Schürmann2015-05-281-7/+4
| * Improve stringsDominik Schürmann2015-05-282-6/+3
| * do nfc dispatching in MainActivityVincent Breitmoser2015-05-284-9/+15
| * Fix language based on feedback from transifexDominik Schürmann2015-05-212-2/+2
| * Fix fingerprint length check in QR Code importDominik Schürmann2015-05-191-1/+1
| * Use Mode.ALPHANUMERIC for QR codes to save spaceDominik Schürmann2015-05-194-9/+24
| * check fingerprint length after scanning qr codeVincent Breitmoser2015-05-171-12/+24
| * open ViewKeyActivity by subkey in NfcBaseActivityVincent Breitmoser2015-05-171-3/+4
| * simplify MainActivity and fix backstack issuesVincent Breitmoser2015-05-171-60/+33
| * re-parcel log in LogDisplayFragmentVincent Breitmoser2015-05-171-6/+20
| * fingerprints are 20 bytes, not 40. duh.Vincent Breitmoser2015-05-171-1/+1
| * load yubikey fragment after mMasterKeyId is availableVincent Breitmoser2015-05-171-17/+33
| * apply promote operation to specific subkeys present on yubikey onlyVincent Breitmoser2015-05-171-1/+8
| * pass masterKeyId to yubikey fragmentVincent Breitmoser2015-05-172-6/+9