aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org
Commit message (Collapse)AuthorAgeFilesLines
* Fix export for new unified key list #409uberspot2014-03-158-79/+111
|
* Fix two bugs in ImportKeys screen (issue #416)uberspot2014-03-142-0/+2
|
* Make email address less restrictive and add icon to show when it's correctuberspot2014-03-142-11/+28
|
* final code style changesuberspot2014-03-1312-106/+132
|
* fix code style in /pgpuberspot2014-03-1311-491/+436
|
* final ui code style changesuberspot2014-03-1312-53/+54
|
* more code style changes in /ui and /utiluberspot2014-03-1324-323/+345
|
* more UI code style fixesuberspot2014-03-139-70/+77
|
* More code style fixes for /uiuberspot2014-03-1316-53/+91
|
* First code style changes in uiuberspot2014-03-1356-634/+486
|
* Fix code style in /helperuberspot2014-03-135-71/+64
|
* Fix code style in keychain/service/uberspot2014-03-1311-87/+129
|
* Optimize imports in all files, remove useless whitespace in some and fix ↵uberspot2014-03-1311-128/+80
| | | | indentation
* Merge pull request #407 from uberspot/masterDominik Schürmann2014-03-131-15/+31
|\ | | | | Add apg's change to colorizing, no more background changes needed
| * add apg's change to colorizing, no more background changes neededuberspot2014-03-131-15/+31
| |
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-131-23/+29
|\ \
| * \ Merge pull request #408 from gogowitczak/masterDominik Schürmann2014-03-131-23/+29
| |\ \ | | | | | | | | Specifying connection port in KeyServer
| | * | Added possibility to specify port for KeyServer.gogowitczak2014-03-131-1/+1
| | | |
| | * | Added possibility to specify port for KeyServer.gogowitczak2014-03-131-24/+30
| | |/
* | / Add FAQ tab to helpDominik Schürmann2014-03-131-8/+11
|/ /
* | Readd create key menu itemsDominik Schürmann2014-03-131-12/+38
| |
* | Cleanup and simplificationDominik Schürmann2014-03-132-61/+24
| |
* | drop unified uri in favor of generic /key_ringsVincent Breitmoser2014-03-132-15/+10
| | | | | | | | | | | | | | this works well in the uri schema, and we get notifications back with no effort. ....also remove a line I committed accidentally oO
* | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-03-137-28/+118
|\| | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
| * Export cancellable - minor changesgrait2014-03-133-6/+10
| |
| * Export is cancellable nowgrait2014-03-133-16/+52
| |
| * Merge pull request #396 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-121-0/+2
| |\ | | | | | | Lint error fix after testing
| | * Merge remote-tracking branch 'upstream/master' into Lint-error-fixBhargav Golla2014-03-1016-203/+344
| | |\
| | * | Lint changes after testingBhargav Golla2014-03-102-1/+2
| | | |
| * | | change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc24526uberspot2014-03-122-12/+60
| | | |
* | | | merge fixes as per comments in mergeVincent Breitmoser2014-03-131-30/+19
| | | | | | | | | | | | | | | | https://github.com/openpgp-keychain/openpgp-keychain/pull/403/files#r10540753
* | | | remove special treatment for unified list queryVincent Breitmoser2014-03-131-39/+14
| | | | | | | | | | | | | | | | | | | | | | | | note: the unified query /will/ need special treatment once certs are joined in, so I am leaving this as an artifact commit for later reference or point to revert to.
* | | | keychainprovider cleanup, kindasortaVincent Breitmoser2014-03-132-56/+47
| | | | | | | | | | | | | | | | | | | | removed code redundancy, and the query is in the switch thing now, I didn't put everything into its own separate sources (yet?).
* | | | Merge branch 'unified-keylist'Vincent Breitmoser2014-03-1213-731/+483
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/AndroidManifest.xml OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml OpenPGP-Keychain/src/main/res/menu/key_list.xml OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
| * | | add contact count to My Keys headerVincent Breitmoser2014-03-081-1/+10
| | | |
| * | | better handling of multi select in ListKeysFragmentVincent Breitmoser2014-03-081-17/+22
| | | |
| * | | ditch old key list activitiesVincent Breitmoser2014-03-087-1110/+1
| | | |
| * | | add edit button and secret key info to public key viewVincent Breitmoser2014-03-083-1/+36
| | | |
| * | | move some placeholders into resourcesVincent Breitmoser2014-03-082-3/+2
| | | |
| * | | Normalize public key uri in KeyListFragmentVincent Breitmoser2014-03-083-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Find the explicit row id of the public key id given in the uri in KeyListFragment and work with that. This way, passing in uris by master key id, mail address, or any other criteria, works. Might be a good idea to add an actual check if the row id is non-zero here, but not sure how to do a "bad intent" thing
| * | | Make EditKeyActivity's uri handling (more) saneVincent Breitmoser2014-03-082-6/+4
| | | | | | | | | | | | | | | | | | | | This activity didn't actually use the uri for anything, but just chopped off the last path segment and interpreted it as row id. What the hell.
| * | | working unified list (no actions yet)Vincent Breitmoser2014-03-086-244/+353
| | | |
| * | | copy public keylist as stub for unified keylistVincent Breitmoser2014-03-063-0/+641
| | | |
* | | | Merge pull request #395 from uberspot/masterDominik Schürmann2014-03-1228-185/+234
|\ \ \ \ | | | | | | | | | | Remove duplicate code from ActionBarHelper. Add export in multiselect.
| * | | | Add Email suggestions in Create Key activityuberspot2014-03-122-5/+53
| | | | |
| * | | | fix plenty of lint warnings, make some for loops into foreach, remove unused ↵uberspot2014-03-1112-21/+24
| | | | | | | | | | | | | | | | | | | | imports and throw exceptions
| * | | | minor clean up in colorize methoduberspot2014-03-111-2/+3
| | | | |
| * | | | Add export... button and functionality in multi-selectuberspot2014-03-118-12/+23
| | | | |
| * | | | Make export work with rowIds instead of MasterKeyIdsuberspot2014-03-116-53/+92
| | | | |
| * | | | Remove duplicate code from ActionBarHelper. You can now set the drawables ↵uberspot2014-03-116-95/+42
| | |_|/ | |/| | | | | | | | | | via the method calls
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 05:26:02 +0000