cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,234 Commits 1 Branch 0 Tags
31ffcb5db07dff8c248a91a791eeda2946dbbb19
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann c9b117b706 more tight layout 2014-03-11 00:31:13 +01:00
Dominik Schürmann 50ed5db001 cleanup 2014-03-11 00:28:28 +01:00
Dominik Schürmann 05126a7d15 Merge pull request #394 from sreeram-boyapati/master 
linear layout edited to display test horizontally #391
 2014-03-11 00:25:26 +01:00
Dominik Schürmann 7fc80be660 Merge pull request #392 from honnel/cursor-reset2 
Reset cursor query when closing search view #386
 2014-03-11 00:15:22 +01:00
Dominik Schürmann 3f5de1eac6 Merge pull request #390 from uberspot/master 
Appropriate save Icon in EditKeyActivity fixes #382
 2014-03-10 23:48:53 +01:00
Dominik Schürmann 612ad9e6b3 Merge pull request #383 from sreeram-boyapati/master 
Fix to passphrase dialog and Issue #207
 2014-03-10 23:20:07 +01:00
Dominik Schürmann 8fa62161df More fixes for KeychainIntentServiceHandler 2014-03-10 22:46:30 +01:00
Dominik Schürmann d339029ab9 Pull from transifex 2014-03-10 22:40:59 +01:00
Dominik Schürmann 59091e417f getString before init of KeychainIntentHandler 2014-03-10 22:37:13 +01:00
Dominik Schürmann bac68c4c73 Fix progress_generating and reformat 2014-03-10 22:22:37 +01:00
Dominik Schürmann be41a0a3e1 Fix progress_generating and reformat 2014-03-10 22:19:43 +01:00
Dominik Schürmann da83c8ff60 @color/white instead of hex 2014-03-10 18:26:52 +01:00
Dominik Schürmann d91e2673d7 Revert "Lint changes" 
This reverts commit e00436b409.
 2014-03-10 18:23:47 +01:00
Dominik Schürmann ef8eb3f8b5 Merge pull request #381 from bhargavgolla/Lint-error-fix 
Lint changes #223
 2014-03-10 18:11:37 +01:00
Dominik Schürmann 83c346fec4 Make code more tidy for multiselect 2014-03-10 17:49:30 +01:00
Dominik Schürmann caa0740919 Improve hightlight query code: make cursor abstract, tidy up code 2014-03-10 17:22:19 +01:00
Dominik Schürmann 70d1e01a2b Merge pull request #384 from mb-14/search1 
Highlight search query in SelectPublicKeyFragment and KeyListPublicFragment
 2014-03-10 17:05:09 +01:00
Dominik Schürmann 2166d66680 Cleanup ImportKeysListEntry 2014-03-10 17:06:11 +01:00
Dominik Schürmann 6a8fa61908 remove double definition of progress_generating 2014-03-10 16:58:58 +01:00
Dominik Schürmann 3372cfacb6 Merge pull request #385 from tharinduwijewardane/master 
Issue #378 ( private keys are no longer red ): Fixed
 2014-03-10 16:02:58 +01:00
Dominik Schürmann 8d85aa5876 remove unneeded replace for newline on fingerprint 2014-03-09 23:51:18 +01:00
Dominik Schürmann a8add47238 Merge pull request #380 from uberspot/master 
Colorize fingerprint
 2014-03-09 23:48:51 +01:00
Dominik Schürmann dd28303dc1 Merge pull request #368 from ajit766/master 
progress is shown when creating the default key based on number of keys created till then
 2014-03-09 23:39:53 +01:00
Dominik Schürmann 9a7a7f2b01 Merge pull request #372 from rafaelav/master 
Issue #178 - Hide advanced options in EncryptActivity
 2014-03-09 23:18:50 +01:00
Dominik Schürmann 50d9908baf Merge pull request #369 from hav3n/branch-fixes 
Fix for #347
 2014-03-09 02:05:23 +01:00
Dominik Schürmann 5b255a263f Fix key id and fingerprint handling, use full key ids 2014-03-09 01:49:25 +01:00
Dominik Schürmann 8dc7a72331 Merge pull request #316 from danielhass/import-error 
Show error if file import has no content
 2014-03-08 18:27:32 +01:00
Dominik Schürmann 402aeeabf3 use parameter in updateFromKeyserver 2014-03-08 17:19:57 +01:00
Dominik Schürmann db05b3043a beta4 2014-03-08 00:17:24 +01:00
Dominik Schürmann 0e33fd2392 Split api libs into OpenKeychain specific and OpenPGP Provider lib 2014-03-07 23:05:03 +01:00
Dominik Schürmann 2737aedca7 Revert "Fix for #347" 
This reverts commit dd80ddd6f9.
 2014-03-07 22:48:20 +01:00
Dominik Schürmann 882333ce05 Merge pull request #366 from uberspot/master 
Minor code clean up
 2014-03-07 22:39:53 +01:00
Dominik Schürmann 7b1e3fef19 Merge pull request #367 from hav3n/branch-fixes 
Fix for #347
 2014-03-07 22:39:20 +01:00
Dominik Schürmann def9e5a492 Move search view into onCreateView, fixes #365 2014-03-07 22:37:38 +01:00
Dominik Schürmann a1be0d302b move search view from activity to fragment by setting it as a list header, better reusability! Required for service activites 2014-03-07 21:32:24 +01:00
Dominik Schürmann 3572571391 Reworking main KeyListPublicFragment to get progress indicator 2014-03-07 20:58:33 +01:00
Dominik Schürmann 0a0bdad5b5 Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-07 19:50:50 +01:00
Dominik Schürmann ba61e69a7d Cleanup code, search with preceeding % 2014-03-07 19:50:36 +01:00
Dominik Schürmann e4736736b0 Merge pull request #361 from mb-14/file 
Add option for  sharing encrypted file.
 2014-03-07 18:37:22 +01:00
Dominik Schürmann 59067f9f8b API: get key 2014-03-07 11:24:53 +01:00
Dominik Schürmann 53ba741810 Fix API docs 2014-03-07 11:05:11 +01:00
Dominik Schürmann a3f17be192 Fix API docs 2014-03-07 10:54:36 +01:00
Dominik Schürmann b9a9bbe429 remove icon from nfc dialog 2014-03-06 22:46:04 +01:00
Dominik Schürmann 0cb5d86860 back to Gradle 1.10, Using Gradle 1.11 requires Android Studio 0.5.0 which is not released yet 2014-03-06 22:24:52 +01:00
Dominik Schürmann 3d944483d3 Merge pull request #344 from ankushb92/ankush2 
#338
 2014-03-06 21:59:56 +01:00
Dominik Schürmann 9edd4bee70 fix pathes in README 2014-03-06 19:49:54 +01:00
Dominik Schürmann 633cca21a0 remove unused search definitions from manifest 2014-03-06 19:41:07 +01:00
Dominik Schürmann 28e4a75e7e Merge pull request #354 from uberspot/master 
Multiselect: Create 'select all' in public and secret keylist
 2014-03-06 19:36:31 +01:00
Dominik Schürmann 414623670e sdk 17 no longer needed 2014-03-06 19:36:37 +01:00
Dominik Schürmann 0ed097a020 Merge pull request #353 from Emantor/new_gradle 
New gradle and gradle plugin Version
 2014-03-06 19:32:12 +01:00
Dominik Schürmann ea2f3e1444 Merge pull request #350 from uberspot/master 
add lock icon for 'Encrypt to..' multiselect option
 2014-03-06 14:31:49 +01:00
Dominik Schürmann 4c6cbd211e Merge pull request #349 from uberspot/master 
Add search icon for other dpi
 2014-03-06 14:06:08 +01:00
Dominik Schürmann e8fbf976da 2.3.1 beta3 2014-03-06 14:02:51 +01:00
Dominik Schürmann 4c49bdcccc Fix documentation and variable naming in API 2014-03-06 14:02:21 +01:00
Dominik Schürmann 036fdc2b38 Fix verify of cleartext signatures with unknown keys 2014-03-06 14:02:06 +01:00
Dominik Schürmann a3fd60e7de Merge pull request #342 from mb-14/search 
Implement search for KeyListPublicFragment and SelectPublicKeyFragment
 2014-03-06 12:47:07 +01:00
Dominik Schürmann 5f3c9f3eb9 Merge pull request #324 from mb-14/datefix 
Expiry selection UI fix
 2014-03-05 21:36:47 +01:00
Dominik Schürmann 9646a3d471 Merge pull request #328 from bhargavgolla/patch-1 
Issue #234 : Adding a min date not to go below creation date
 2014-03-05 21:10:58 +01:00
Dominik Schürmann 0409700a93 Merge pull request #339 from uberspot/master 
Put Preferences in subscreen
 2014-03-05 20:13:44 +01:00
Dominik Schürmann b71c4f358d Merge pull request #336 from Emantor/travis_new_build_tools 
Update travis to build-tools-19.0.3
 2014-03-05 20:06:36 +01:00
Dominik Schürmann 452d8d3fa4 Merge pull request #335 from honnel/master 
updated build.gradle-Files to current Versions of build-tools and SDK.
 2014-03-05 20:05:16 +01:00
Dominik Schürmann 205e3d7f86 Merge pull request #337 from siacs/master 
added generated ant files
 2014-03-05 19:57:32 +01:00
Dominik Schürmann a1230bbe53 Fix passphrase retrieval 2014-03-05 02:06:44 +01:00
Dominik Schürmann 875adae40c Code cleaning in PgpDecryptVerify 2014-03-04 23:14:52 +01:00
Dominik Schürmann 61ee811d60 Fix license header of key server files 2014-03-04 22:42:44 +01:00
Dominik Schürmann a83c18bafb Remove unused imports 2014-03-04 22:20:59 +01:00
Dominik Schürmann e1f525a0ac name KeychainIntentService properly 2014-03-04 22:17:45 +01:00
Dominik Schürmann 9c19394da6 Update from transifex 2014-03-04 22:06:30 +01:00
Dominik Schürmann fe8044d181 2.3.1 beta2 2014-03-04 20:58:53 +01:00
Dominik Schürmann 06f9134eb1 Enforce private key for applications, verify signed-only texts without passphrase input, better internal decrypt and verify method 2014-03-04 20:53:44 +01:00
Dominik Schürmann 89a4c38cc0 return SIGNATURE_SUCCESS_UNCERTIFIED from service 2014-03-04 15:18:05 +01:00
Dominik Schürmann 1613a015d6 Merge pull request #322 from mj7007/smooth_activity_switch 
Smooth Activity Switch Fixed
 2014-03-04 10:59:59 +01:00
Dominik Schürmann 07bb421da5 Merge pull request #315 from jessicayuen/master 
#226: Added cancel option to ProgressDialogFragments. Create Key is now cancelable.
 2014-03-04 10:51:26 +01:00
Dominik Schürmann b837579cdc Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-03 15:46:04 +01:00
Dominik Schürmann 94e161fe0d change ordering in Intent descriptions for better readability in small dialogs 2014-03-03 15:45:53 +01:00
Dominik Schürmann 3acbefa98b Merge pull request #319 from Emantor/lint_fix 
Fix Lint ScrollViewSize, DefaultLocale Warnings and NewApi errors
 2014-03-03 14:39:35 +01:00
Dominik Schürmann ebd6719690 Put build status on top 2014-03-03 13:36:11 +01:00
Dominik Schürmann ab69cca2e5 README link updated 2014-03-03 13:31:21 +01:00
Dominik Schürmann f54d183bec Put api docs into wiki 2014-03-03 13:27:43 +01:00
Dominik Schürmann 6465c1a28d Add travis status icon to README 2014-03-03 13:15:24 +01:00
Dominik Schürmann dadca4b037 README 2014-03-03 13:11:27 +01:00
Dominik Schürmann abbfc34e58 Merge pull request #317 from Emantor/travis 
Add travis ci support to OpenPGP-Keychain, Fix #156
 2014-03-03 12:54:42 +01:00
Dominik Schürmann 7f384e7346 version code 3 API lib 2014-03-02 18:21:32 +01:00
Dominik Schürmann 64601fa981 version code 23101 for beta testing 2014-03-02 18:18:55 +01:00
Dominik Schürmann 6ddccb0d6f version code 23101 for beta testing 2014-03-02 18:15:11 +01:00
Dominik Schürmann 339136dda5 Update from transifex 2014-03-02 18:14:49 +01:00
Dominik Schürmann 4cb309c1cc add lib icons for holo light 2014-03-02 02:25:31 +01:00
Dominik Schürmann 8c6017e890 fixes for OpenPgpListPreference 2014-03-02 02:17:20 +01:00
Dominik Schürmann 4a13f70a88 API changes 2014-03-02 01:20:06 +01:00
Dominik Schürmann 0c60eea628 Merge pull request #306 from danielhass/keyserver-conerror 
Show error if keyserver is not reachable
 2014-02-28 23:27:57 +01:00
Dominik Schürmann 31292bd057 Merge pull request #311 from emdete/master 
prevent null byte[] in case of encoding exc
 2014-02-28 16:40:23 +01:00
Dominik Schürmann a2544fb2b0 Fix binding of install intents to package 2014-02-27 21:43:52 +01:00
Dominik Schürmann 7bbfd9d446 cleanup 2014-02-27 16:55:42 +01:00
Dominik Schürmann 5c78c11756 remove dublication of api library, let both proejcts depend on the same 2014-02-27 16:40:59 +01:00
Dominik Schürmann 152790a194 Merge pull request #305 from hav3n/branch-dialog-fragment 
Partial fix for #304
 2014-02-27 13:49:06 +01:00
Dominik Schürmann 3ff7610d3b Merge pull request #308 from mar-v-in/issue-295 
Show link to Market if no openpgp provider installed installed
 2014-02-27 13:14:24 +01:00
Dominik Schürmann 5f669fa813 Merge pull request #303 from hav3n/branch-fix-icon 
Fix for #266
 2014-02-25 20:25:09 +01:00
Dominik Schürmann 6dabe9bf7f Merge pull request #300 from danielhass/master 
Replaced Toast with AppMsg in DecryptActivity
 2014-02-25 07:46:30 +01:00
Dominik Schürmann e97630b75e reapply accedentially reverted 5d88672609 2014-02-24 01:47:53 +01:00
Dominik Schürmann 0747a5815f cleanup 2014-02-24 01:32:00 +01:00