moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-16 13:55:03 -05:00
Code Issues Releases Wiki Activity
1,291 Commits 12 Branches 24 Tags 116 MiB
f26ba217e5
Commit Graph

265 Commits

Author SHA1 Message Date
uberspot
f26ba217e5 Fix code style in /helper 2014-03-13 20:14:04 +02:00
uberspot
540aa044e2 Fix code style in keychain/service/ 2014-03-13 20:14:04 +02:00
uberspot
79a8528a63 Optimize imports in all files, remove useless whitespace in some and fix indentation 2014-03-13 20:14:04 +02:00
Dominik Schürmann
5b907f222e Merge pull request #407 from uberspot/master 
Add apg's change to colorizing, no more background changes needed
 2014-03-13 19:09:13 +01:00
Dominik Schürmann
bc1a3850ac Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-13 19:08:29 +01:00
Dominik Schürmann
908cf8e769 Add FAQ tab to help 2014-03-13 19:08:03 +01:00
Dominik Schürmann
32dcf86212 Merge pull request #408 from gogowitczak/master 
Specifying connection port in KeyServer
 2014-03-13 19:02:35 +01:00
Dominik Schürmann
4c5ae3cdaa Readd create key menu items 2014-03-13 19:01:24 +01:00
Dominik Schürmann
471cefa71f Cleanup and simplification 2014-03-13 18:27:08 +01:00
gogowitczak
ccde4212e0 Added possibility to specify port for KeyServer. 2014-03-13 15:53:43 +01:00
gogowitczak
f4370b3ac8 Added possibility to specify port for KeyServer. 2014-03-13 15:39:38 +01:00
uberspot
f055228e5b add apg's change to colorizing, no more background changes needed 2014-03-13 16:09:37 +02:00
Vincent Breitmoser
be3828c89e drop unified uri in favor of generic /key_rings 
this works well in the uri schema, and we get notifications back with no
effort.

....also remove a line I committed accidentally oO
 2014-03-13 14:34:07 +01:00
Vincent Breitmoser
9a1ce093bf Merge remote-tracking branch 'origin/master' 
Conflicts:
	OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
 2014-03-13 13:40:47 +01:00
Vincent Breitmoser
6af65a2a9b merge fixes as per comments in merge 
https://github.com/openpgp-keychain/openpgp-keychain/pull/403/files#r10540753
 2014-03-13 13:06:23 +01:00
grait
ccdf646c19 Export cancellable - minor changes 2014-03-13 05:58:48 +05:30
grait
3f649d4458 Export is cancellable now 2014-03-13 05:40:40 +05:30
Vincent Breitmoser
b9a907df0b remove special treatment for unified list query 
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.
 2014-03-13 00:29:28 +01:00
Vincent Breitmoser
0b0809ec17 keychainprovider cleanup, kindasorta 
removed code redundancy, and the query is in the switch thing now, I
didn't put everything into its own separate sources (yet?).
 2014-03-13 00:16:11 +01:00
Dominik Schürmann
217f4a1cef Merge pull request #396 from bhargavgolla/Lint-error-fix 
Lint error fix after testing
 2014-03-12 22:28:25 +01:00
uberspot
e909b6bb9d change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc24526 2014-03-12 19:14:13 +02:00
Vincent Breitmoser
69f5bf6b57 Merge branch 'unified-keylist' 
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
 2014-03-12 18:05:28 +01:00
Dominik Schürmann
a9e5619a14 Merge pull request #395 from uberspot/master 
Remove duplicate code from ActionBarHelper. Add export in multiselect.
 2014-03-12 16:23:22 +01:00
Dominik Schürmann
5a5509053f Merge pull request #397 from tharinduwijewardane/master 
Fix for Issue #393 ( PublicKeyListFragment: Query not really resetted )
 2014-03-12 16:12:35 +01:00
Miroojin Bakshi
11b19f0fce Fix error in importing/updating keys from keyserver by removing extra 0x 2014-03-12 20:14:56 +05:30
uberspot
b955c3de01 Add Email suggestions in Create Key activity 2014-03-12 02:04:04 +02:00
uberspot
d586ad288d fix plenty of lint warnings, make some for loops into foreach, remove unused imports and throw exceptions 2014-03-11 23:42:45 +02:00
Tharindu Wijewardane
e2ec5a3882 Issue #393 ( PublicKeyListFragment: Query not really resetted ) : Fixed 2014-03-11 11:04:31 +05:30
Bhargav Golla
31ffcb5db0 Merge remote-tracking branch 'upstream/master' into Lint-error-fix 2014-03-10 23:17:00 -04:00
uberspot
e8122df35d minor clean up in colorize method 2014-03-11 04:13:58 +02:00
uberspot
43a20ad1da Add export... button and functionality in multi-select 2014-03-11 03:53:00 +02:00
uberspot
361c45a481 Make export work with rowIds instead of MasterKeyIds 2014-03-11 03:22:05 +02:00
uberspot
d937317012 Remove duplicate code from ActionBarHelper. You can now set the drawables via the method calls 2014-03-11 01:50:17 +02:00
Dominik Schürmann
50ed5db001 cleanup 2014-03-11 00:28:28 +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
Daniel Hammann
506782b689 OnFocusChangeListener replaced with OnActionExpandListener 
For same behaviour like contacts app #386 #387
 2014-03-11 00:07:53 +01:00
uberspot
3cad8b6248 Appropriate save Icon in EditKeyActivity 2014-03-11 00:46:25 +02: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
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
Daniel Hammann
6fab8a126a Reset cursor query when closing search view #386 
Without focus the search result get erased.
 2014-03-10 20:58:15 +01:00
Bhargav Golla
b90e680ff9 Lint changes after testing 2014-03-10 14:59:15 -04: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
Sreeram Boyapati
a41ee31b6c Added string reference for Issue #207 2014-03-10 22:37:23 +05:30
Dominik Schürmann
83c346fec4 Make code more tidy for multiselect 2014-03-10 17:49:30 +01:00
Bhargav Golla
e00436b409 Lint changes 
Deleting lint-report gen files

Adding lint output files to gitignore
 2014-03-10 12:42:00 -04:00
Dominik Schürmann
caa0740919 Improve hightlight query code: make cursor abstract, tidy up code 2014-03-10 17:22:19 +01:00