aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \
| * \ \ Merge pull request #319 from Emantor/lint_fixDominik Schürmann2014-03-036-11/+17
| |\ \ \ | | | | | | | | | | Fix Lint ScrollViewSize, DefaultLocale Warnings and NewApi errors
| | * | | 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
|/ / / /
* | | | Put build status on topDominik Schürmann2014-03-031-5/+4
| | | |
* | | | README link updatedDominik Schürmann2014-03-031-4/+2
| | | |
* | | | Put api docs into wikiDominik Schürmann2014-03-031-57/+9
| | | |
* | | | Add travis status icon to READMEDominik Schürmann2014-03-031-0/+2
| | | |
* | | | READMEDominik Schürmann2014-03-031-1/+1
| | | |
* | | | Merge pull request #317 from Emantor/travisDominik Schürmann2014-03-032-0/+19
|\ \ \ \ | |/ / / |/| | | Add travis ci support to OpenPGP-Keychain, Fix #156
| * | | This adds travis ci support to OpenPGP-Keychain.Emantor2014-03-032-0/+19
| | | | | | | | | | | | | | | | | | | | Currently only correct assembly is tested since upstream Spongycastle fails some of its tests.
* | | | version code 3 API libDominik Schürmann2014-03-021-2/+2
| | | |
* | | | 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
| | | |
* | | | add lib icons for holo lightDominik Schürmann2014-03-024-0/+0
| | | |
* | | | fixes for OpenPgpListPreferenceDominik Schürmann2014-03-021-21/+30
| | | |
* | | | API changesDominik Schürmann2014-03-0211-421/+301
| |/ / |/| |
* | | 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
| | | |
* | | | Merge pull request #311 from emdete/masterDominik Schürmann2014-02-281-3/+3
|\ \ \ \ | |_|/ / |/| | | prevent null byte[] in case of encoding exc
| * | | prevent null byte[] in case of encoding excM. Dietrich2014-02-281-3/+3
| | | |
* | | | Fix binding of install intents to packageDominik Schürmann2014-02-271-1/+1
| | | |
* | | | cleanupDominik Schürmann2014-02-274-40/+22
| | | |
* | | | remove dublication of api library, let both proejcts depend on the sameDominik Schürmann2014-02-2722-1339/+2
| | | |
* | | | Merge pull request #305 from hav3n/branch-dialog-fragmentDominik Schürmann2014-02-274-126/+272
|\ \ \ \ | | | | | | | | | | Partial fix for #304
| * | | | 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
| | | | |
* | | | | Merge pull request #308 from mar-v-in/issue-295Dominik Schürmann2014-02-272-3/+48
|\ \ \ \ \ | |_|_|/ / |/| | | | Show link to Market if no openpgp provider installed installed
| * | | | Change resource name and remove unneeded if from 44232afmar-v-in2014-02-272-13/+11
| | | | |
| * | | | Show link to Market if no openpgp provider installed installedmar-v-in2014-02-272-3/+50
|/ / / / | | | | | | | | | | | | Issue #295