Commit Graph

1378 Commits

Author SHA1 Message Date
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
Dominik Schürmann
f5c50c3896 Merge pull request #388 from ajit766/exportkeyfix
Export is cancellable now
2014-03-13 09:35:07 +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
Dominik Schürmann
65633112a0 Merge pull request #404 from uberspot/master
Change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc
2014-03-12 22:12:51 +01:00
Dominik Schürmann
c8c8d8f4b6 Merge pull request #405 from honnel/checkstyle
Checkstyle configuration information reworked
2014-03-12 22:10:11 +01:00
Dominik Schürmann
0749eef1c5 Merge pull request #406 from Emantor/tests_and_travis
Reduce travis library installation overhead
2014-03-12 22:09:50 +01:00
Daniel Hammann
5eb12ef88f Squashed commit of the following:
commit 1df4d4a9e0
Author: Daniel Hammann <github@honnel.de>
Date:   Wed Mar 12 21:33:13 2014 +0100

    Added Windows section to CheckStyle configuration information part (and splitted Linux and MacOSX up).
2014-03-12 21:36:42 +01:00
Daniel Hammann
1df4d4a9e0 Added Windows section to CheckStyle configuration information part (and splitted Linux and MacOSX up). 2014-03-12 21:33:13 +01:00
Daniel Hammann
6ca58dd211 Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain 2014-03-12 20:44:33 +01:00
Emantor
5848172621 Reduce library installation overhead 2014-03-12 20:33:08 +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
Dominik Schürmann
c7f4fc72d8 Merge pull request #402 from mb-14/hkpget
Fix error in  importing/updating keys from keyserver by removing extra 0x
2014-03-12 15:59:47 +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
uberspot
317595dc72 Added initial xml and readme info for checkstyle 2014-03-11 23:41:21 +02:00
Tharindu Wijewardane
e2ec5a3882 Issue #393 ( PublicKeyListFragment: Query not really resetted ) : Fixed 2014-03-11 11:04:31 +05:30
Tharindu Wijewardane
03b0e43aa2 Merge pull request #1 from openpgp-keychain/master
updating my fork
2014-03-11 09:14:46 +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
77ebfd0875 Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain 2014-03-11 00:12:45 +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
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
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