aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain
Commit message (Collapse)AuthorAgeFilesLines
* 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-089-246/+450
|
* copy public keylist as stub for unified keylistVincent Breitmoser2014-03-068-5/+776
|
* Merge pull request #322 from mj7007/smooth_activity_switchDominik Schürmann2014-03-041-8/+15
|\ | | | | Smooth Activity Switch Fixed
| * Smooth Activity Switch Fixedmj70072014-03-041-8/+15
| |
* | Merge pull request #315 from jessicayuen/masterDominik Schürmann2014-03-047-11/+87
|\ \ | | | | | | #226: Added cancel option to ProgressDialogFragments. Create Key is now cancelable.
| * | #226: Small fix to prevent message from being sent if IntentService is canceledJessica Yuen2014-03-031-0/+16
| | |
| * | #226: Async key gen task is stopped if progress is canceledJessica Yuen2014-03-025-17/+40
| | |
| * | #226: Activity no longer closes if progress is canceled for key creation in ↵Jessica Yuen2014-03-025-10/+17
| | | | | | | | | | | | EditKeyActivity
| * | #226: Added cancel option to ProgressDialogFragments. Create Key is now ↵Jessica Yuen2014-03-026-9/+39
| | | | | | | | | | | | cancelable.
* | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-036-11/+17
|\ \ \
| * | | Fix NewApi Lint ErrorsEmantor2014-03-033-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | Fix missing ; import android.annotation.TargetApi where needed
| * | | Fix DefaultLocale Lint WarningsEmantor2014-03-031-3/+4
| | | |
| * | | Fix ScrollViewSize Lint WarningsEmantor2014-03-033-6/+6
| | | |
* | | | change ordering in Intent descriptions for better readability in small dialogsDominik Schürmann2014-03-031-4/+4
|/ / /
* | | version code 23101 for beta testingDominik Schürmann2014-03-021-1/+1
| | |
* | | version code 23101 for beta testingDominik Schürmann2014-03-021-1/+1
| | |
* | | Update from transifexDominik Schürmann2014-03-0239-276/+626
| | |
* | | API changesDominik Schürmann2014-03-023-160/+132
|/ /
* | Merge pull request #306 from danielhass/keyserver-conerrorDominik Schürmann2014-02-285-27/+102
|\ \ | | | | | | Show error if keyserver is not reachable
| * | Some clean upDaniel Haß2014-02-281-4/+2
| | |
| * | Added different notifys for different exceptionsDaniel Haß2014-02-271-6/+17
| | |
| * | Added error strings for key import from keyserverDaniel Haß2014-02-271-0/+3
| | |
| * | Added StackOverflow link to documentationDaniel Haß2014-02-271-0/+2
| | |
| * | Added documentation to the AsyncTaskResultWrapperDaniel Haß2014-02-271-0/+5
| | |
| * | Adapted the ImportKeysLoader to work with the new AsyncWrapperDaniel Haß2014-02-263-9/+13
| | |
| * | Reworked ImportKeysListFragment to handel exceptions, ImportKeyListLoader is ↵Daniel Haß2014-02-262-20/+34
| | | | | | | | | | | | temporarily disabled
| * | Added the AsyncTaskResultWrapperDaniel Haß2014-02-261-0/+38
| | |
* | | cleanupDominik Schürmann2014-02-274-40/+22
| | |
* | | remove dublication of api library, let both proejcts depend on the sameDominik Schürmann2014-02-271-1/+1
| | |
* | | Added GPL headersNikhil Peter Raj2014-02-272-11/+31
| | |
* | | Complete fix for #304Nikhil Peter Raj2014-02-272-94/+170
| | |
* | | Partial fix for #304Nikhil Peter Raj2014-02-262-32/+82
|/ /
* | Final fix for #266Nikhil Peter Raj2014-02-262-2/+2
| | | | | | | | | | -Fix implemented using setIcon() as setIconAttribute() is not valid for API less than 11
* | Removed Thumbs.db,added to gitignoreNikhil Peter Raj2014-02-254-0/+0
| |
* | Fix for #266Nikhil Peter Raj2014-02-2510-2/+3
|/ | | | | -Extra: Added the appropriate images to drawable folder from Android SDK source, can be used as alternative if required.
* Replaced Toast with AppMsg in DecryptActivityDaniel Haß2014-02-241-16/+17
|
* cleanupDominik Schürmann2014-02-241-57/+7
|
* fix signature passing and verify in demoDominik Schürmann2014-02-241-5/+6
|
* remove debug stuffDaniel Haß2014-02-231-2/+1
|
* Revert "Replaced Toast with AppMsg in EncryptActivity"Daniel Haß2014-02-231-13/+15
| | | | This reverts commit e936a4762b4c6ed8153d216ab4655e251c4366f3.
* Replaced Toast with AppMsg in EncryptActivityDaniel Haß2014-02-231-15/+13
|
* Replaced Toast with AppMsg in EncryptActivityDaniel Haß2014-02-231-13/+15
|
* Update help_start.htmlDominik Schürmann2014-02-231-1/+1
|
* AndroidManfiest code for later...Dominik Schürmann2014-02-212-3/+23
|
* import key from email app directlyDominik Schürmann2014-02-211-25/+37
|
* precompile user id patternDominik Schürmann2014-02-211-2/+3
|
* renameDominik Schürmann2014-02-212-7/+7
|
* internal renaming, cleanupDominik Schürmann2014-02-215-36/+50
|