moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-17 21:02:17 -05:00
Code Issues Releases Wiki Activity
1,426 Commits 12 Branches 24 Tags 116 MiB
0edfd7ed48
Commit Graph

743 Commits

Author SHA1 Message Date
uberspot
2d0817bd74 final code style changes 2014-03-13 23:03:20 +02:00
uberspot
1c95970ea3 fix code style in /pgp 2014-03-13 22:08:13 +02:00
uberspot
6ac4d6c218 final ui code style changes 2014-03-13 21:39:14 +02:00
uberspot
2ff6949c95 more code style changes in /ui and /util 2014-03-13 21:30:56 +02:00
uberspot
4353ea37e2 more UI code style fixes 2014-03-13 21:30:56 +02:00
uberspot
dc5c34ffc5 More code style fixes for /ui 2014-03-13 21:30:56 +02:00
Dominik Schürmann
37c81400ac Fix colors in item view 2014-03-13 20:18:25 +01:00
Dominik Schürmann
c1e16995db remove unused color 2014-03-13 20:12:57 +01:00
Dominik Schürmann
ba9a4bec3a Improve list item view, borderless button for API < 11 2014-03-13 20:11:21 +01:00
uberspot
ad1e047aa9 First code style changes in ui 2014-03-13 20:25:01 +02:00
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
5c5e9d8e32 Forgot faq file 2014-03-13 19:09:54 +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
cf51e5ff56 XML cleanup and bigger filename EditText 2014-03-13 18:53:21 +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
15d94c51bb Removing tab 2014-03-10 23:20:30 -04:00
Bhargav Golla
b4022b9a24 Removing unused string 2014-03-10 23:19:10 -04:00
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
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
Sreeram Boyapati
dc865427e3 linear layout edited to display test horizontally 2014-03-11 04:50:15 +05:30
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
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
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
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
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
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
Miroojin Bakshi
b8261d7319 Merge remote-tracking branch 'upstream/master' into search1 2014-03-10 21:11:14 +05:30
Miroojin Bakshi
98da2d0c48 Create custom HighlightQueryCursorAdapter 2014-03-10 21:10:04 +05:30
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
Tharindu Wijewardane
2b4b09d13c Issue #378 ( private keys are no longer red ): Fixed 2014-03-10 17:10:16 +05:30
Miroojin Bakshi
b927c0f26a Highlight search query in SelectPublicKeyFragment and 
KeyListPublicFragment
 2014-03-10 15:25:09 +05:30
Sreeram Boyapati
b47f291d12 ViewHolder Pattern Implemented 2014-03-10 11:49:18 +05:30
Sreeram Boyapati
7d2c3f860e Fix to passphrase dialog and Issue #207 2014-03-10 08:31:53 +05:30
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
rafaelav
b107766f5b Issue #178 - Hide advanced options in EncryptActivity 2014-03-09 22:30:01 +01:00
grait
4874ea567a progress bar while key creation - added plurals based on no.of keys while key creation 2014-03-09 17:45:58 +05:30
grait
e471560e25 progress bar during key creation - minor text change 2014-03-09 14:59:56 +05:30
grait
7b8668a7e3 Merge branch 'develop' into master2 2014-03-09 14:44:20 +05:30
uberspot
059e57c5d0 Colorize fingerprint 2014-03-09 04:14:23 +02: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
Nikhil Peter Raj
14b3807811 Revised fix for #347 2014-03-09 01:32:41 +05:30
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
Vincent Breitmoser
be558944b5 add contact count to My Keys header 2014-03-08 14:52:29 +01:00
Vincent Breitmoser
de6daf5c30 better handling of multi select in ListKeysFragment 2014-03-08 14:08:44 +01:00
Vincent Breitmoser
16116ba725 ditch old key list activities 2014-03-08 13:42:50 +01:00
Vincent Breitmoser
706e212b6b add edit button and secret key info to public key view 2014-03-08 13:17:52 +01:00
Vincent Breitmoser
7ad8977cf3 move some placeholders into resources 2014-03-08 12:28:20 +01:00
Vincent Breitmoser
aa8a8f069f Normalize public key uri in KeyListFragment 
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
 2014-03-08 12:07:20 +01:00
Vincent Breitmoser
191c5b8130 Make EditKeyActivity's uri handling (more) sane 
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.
 2014-03-08 11:58:26 +01:00
Vincent Breitmoser
8c6cb8b0ab working unified list (no actions yet) 2014-03-08 11:19:34 +01:00
Nikhil Peter Raj
b29c430959 Fix for #347 2014-03-08 15:28:46 +05:30
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
grait
3fbda4245c progress is shown when creating the default key based on number of keys created so far 2014-03-08 03:27:22 +05:30
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
uberspot
477d06c43a removed useless semicolons, fixed some parameters in documenation, simplified some conditionals 2014-03-07 22:35:49 +02:00
uberspot
c1c462db4f move hardcode strings to strings.xml 2014-03-07 22:35:49 +02:00
uberspot
ca851ba21f remove unused imports and unthrown exceptions 2014-03-07 22:35:49 +02:00
Nikhil Peter Raj
dd80ddd6f9 Fix for #347 2014-03-08 02:04:50 +05:30
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
Miroojin Bakshi
2e2a9bc967 Add option for sharing encrypted file. 2014-03-07 21:16:58 +05:30
Dominik Schürmann
59067f9f8b API: get key 2014-03-07 11:24:53 +01:00
Dominik Schürmann
b9a9bbe429 remove icon from nfc dialog 2014-03-06 22:46:04 +01:00
Dominik Schürmann
3d944483d3 Merge pull request #344 from ankushb92/ankush2 
#338
 2014-03-06 21:59:56 +01:00
Ankush
8e29b82d6d corrected commit 
mCurrentPassPhrase, mChangePassPhrase

Minor variable naming Issue #338
 2014-03-07 00:43:09 +05:30
Dominik Schürmann
633cca21a0 remove unused search definitions from manifest 2014-03-06 19:41:07 +01:00
uberspot
1cf912de2b Multiselect: Create 'select all' in public and secret keylist 2014-03-06 20:32:27 +02:00
uberspot
ccbb6f95f4 add lock icon for 'Encrypt to..' multiselect option 2014-03-06 15:27:48 +02: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
uberspot
d374f0ffbd Add search icon for other dpi 2014-03-06 14:33:04 +02: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
Miroojin Bakshi
fab549c2b5 Use selectionArgs parameter to pass mCurquery. 2014-03-06 16:27:35 +05:30
Vincent Breitmoser
4851f7f8fc copy public keylist as stub for unified keylist 2014-03-06 01:32:18 +01:00
Miroojin Bakshi
7932dd8a81 Implement search for SelectPublicKeyFragment 2014-03-06 03:37:04 +05:30
Miroojin Bakshi
53f6189301 Implement search for KeyListPublicFragment 2014-03-06 02:24:13 +05:30
Miroojin Bakshi
f99b7585fc Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain into datefix 2014-03-06 01:49:36 +05:30
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
Miroojin Bakshi
127ab0fd81 Use string from strings.xml 2014-03-06 01:27:35 +05:30
Bhargav Golla
42fc15e66e Removed log statements as per Dominik's suggestions 2014-03-05 14:46:38 -05:00
Miroojin Bakshi
a7a8f0a78e Add documentation 2014-03-06 01:13:08 +05:30
Dominik Schürmann
0409700a93 Merge pull request #339 from uberspot/master 
Put Preferences in subscreen
 2014-03-05 20:13:44 +01:00
uberspot
2000959997 Put Preferences in subscreen 2014-03-05 20:46:33 +02:00
Bhargav Golla
92ba91de14 Set min date to one day after Created Date. Works on Honeycomb and above 2014-03-05 12:48:24 -05:00
Daniel Hammann
e482fe18fe Lint Issue: 
TypographyEllipsis: Ellipsis string can be replaced with ellipsis character
Replace "..." with ellipsis character (…, &#8230;)
... -> …
 2014-03-05 17:46:12 +01:00
Daniel Hammann
bc5f2a9305 Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain 2014-03-05 17:05:01 +01:00
Daniel Hammann
bbda6a5b02 updated build.gradle-Files to current Versions of build-tools and SDK. 2014-03-05 14:14:22 +01:00
Bhargav Golla
7a95784074 Adding a min date not to go below creation date 2014-03-04 22:37:56 -05: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