aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
Commit message (Expand)AuthorAgeFilesLines
* merge masterAshley Hughes2014-03-291-55/+57
|\
| * Rename old mentionings of APG-named thingsThialfihar2014-03-231-4/+4
| * Because of an unknown reason toast messages were commented out.Daniel Hammann2014-03-211-10/+7
| * Fix GPL HeadersNikhil Peter Raj2014-03-211-1/+1
| * Fix for #410Nikhil Peter Raj2014-03-211-5/+9
| * Merge pull request #435 from sreeram-boyapati/change_passphraseDominik Schürmann2014-03-181-3/+5
| |\
| | * Button Text changes to Change Passphrase if Passphrase is setSreeram Boyapati2014-03-181-3/+5
| * | Fix export for new unified key list #409uberspot2014-03-151-2/+4
| |/
| * Make email address less restrictive and add icon to show when it's correctuberspot2014-03-141-2/+0
| * final ui code style changesuberspot2014-03-131-1/+1
| * More code style fixes for /uiuberspot2014-03-131-9/+10
| * First code style changes in uiuberspot2014-03-131-54/+49
| * Merge branch 'unified-keylist'Vincent Breitmoser2014-03-121-4/+2
| |\
| | * Make EditKeyActivity's uri handling (more) saneVincent Breitmoser2014-03-081-4/+2
| * | Add export... button and functionality in multi-selectuberspot2014-03-111-2/+1
| * | Make export work with rowIds instead of MasterKeyIdsuberspot2014-03-111-1/+2
| * | Remove duplicate code from ActionBarHelper. You can now set the drawables via...uberspot2014-03-111-5/+5
| * | Appropriate save Icon in EditKeyActivityuberspot2014-03-111-1/+1
| * | getString before init of KeychainIntentHandlerDominik Schürmann2014-03-101-1/+1
| * | Fix progress_generating and reformatDominik Schürmann2014-03-101-1/+2
| * | progress is shown when creating the default key based on number of keys crea...grait2014-03-081-1/+1
| * | removed useless semicolons, fixed some parameters in documenation, simplified...uberspot2014-03-071-2/+2
* | | pass through original primary IDAshley Hughes2014-03-271-0/+1
* | | keep up with masterAshley Hughes2014-03-071-18/+32
|\| |
| * | corrected commitAnkush2014-03-071-17/+17
| |/
| * #226: Async key gen task is stopped if progress is canceledJessica Yuen2014-03-021-2/+14
| * #226: Activity no longer closes if progress is canceled for key creation in E...Jessica Yuen2014-03-021-1/+1
| * #226: Added cancel option to ProgressDialogFragments. Create Key is now cance...Jessica Yuen2014-03-021-1/+3
* | use parcel to save keys, but saving existing keys is disabled, pending a rewr...Ashley Hughes2014-03-061-29/+17
* | fix saving new key (tmp)Ashley Hughes2014-03-061-1/+4
* | pass through which keys are newAshley Hughes2014-02-221-0/+2
* | change how primary id changing is passed throughAshley Hughes2014-02-221-0/+2
* | pass through deleted keysAshley Hughes2014-02-151-0/+3
* | propgate throughAshley Hughes2014-02-141-3/+4
* | save work, this code doesn't work...Ashley Hughes2014-02-131-0/+15
* | saving fixesAshley Hughes2014-02-081-13/+13
* | some AS Inspect Code fixesAshley Hughes2014-02-081-18/+15
* | consistent uiAshley Hughes2014-02-081-10/+7
* | keep track of brand new keys, they need savingAshley Hughes2014-02-081-1/+4
* | fix create keyring crashAshley Hughes2014-02-081-6/+10
* | disable export if unsavedAshley Hughes2014-02-081-2/+6
* | small extra checkAshley Hughes2014-02-081-18/+20
* | can change passwordsAshley Hughes2014-02-061-1/+1
* | ask for saveAshley Hughes2014-02-061-2/+31
* | action bar and a small fixAshley Hughes2014-02-061-26/+31
* | passphrase changes update need to saveAshley Hughes2014-02-061-3/+21
* | final link in chain, fix compileAshley Hughes2014-02-061-6/+6
* | saveAshley Hughes2014-02-051-1/+12
* | fix certify keys without sign flagAshley Hughes2014-02-041-1/+1
|/
* change when passphrase is requested in edit activityAshley Hughes2014-02-021-22/+29