cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,937 Commits 1 Branch 0 Tags
36f8e9f56369e8514348ba13679ceca40b8ed9d0
Commit Graph

597 Commits

Author SHA1 Message Date
Vincent Breitmoser
36f8e9f563 linked: fix small typo 2015-08-31 13:48:40 +02:00
Dominik Schürmann
bff302f808 Show linked identity menu item and linked identities only when feature is enabled 2015-08-29 17:27:04 +02:00
Dominik Schürmann
feef4a93ab Reword experimental settings 2015-08-29 17:19:58 +02:00
Vincent Breitmoser
e037b78248 Merge remote-tracking branch 'origin/master' 2015-08-29 13:29:51 +02:00
Vincent Breitmoser
a6e25e6448 Merge branch 'linked-identities' (and fix OperationHelper ids) 
Merge Linked Identities.

Also includes an important fix for OperationHelper ids, which had an
error in the bit mask logic.

Conflicts:
	Graphics/update-drawables.sh
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
	OpenKeychain/src/main/res/anim/fade_in.xml
	OpenKeychain/src/main/res/anim/fade_out.xml
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
	OpenKeychain/src/main/res/layout/view_key_fragment.xml
	OpenKeychain/src/main/res/menu/key_view.xml
	OpenKeychain/src/main/res/values/strings.xml
	OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
	README.md
 2015-08-29 13:28:56 +02:00
Dominik Schürmann
3c25dc2b0c Improve decrypt strings 2015-08-28 17:47:56 +02:00
Dominik Schürmann
765ec094c9 Make keybase an experimental feature 2015-08-28 15:18:11 +02:00
Dominik Schürmann
0aaa93ac04 Dont show FAB for expired, revoked keys 2015-08-28 11:50:13 +02:00
Dominik Schürmann
20f652350a Improve certify strings 2015-08-28 10:41:45 +02:00
Dominik Schürmann
1b5afc3247 Experimental word comparison 2015-08-27 21:53:33 +02:00
Dominik Schürmann
cac0f8ec9e Prettify settings, rename some strings 2015-08-27 15:53:29 +02:00
Dominik Schürmann
c292b8d9c3 Experimental features settings reworked 2015-08-27 13:59:26 +02:00
Dominik Schürmann
ec7a3a7047 Experimental feature setting 2015-08-27 12:24:37 +02:00
Dominik Schürmann
f92e5f663f fix msg_ip_merge_secret 2015-08-26 15:26:24 +02:00
Dominik Schürmann
5a7f2b2c12 Use CDATA to prevent transifex problems 2015-08-26 15:24:29 +02:00
Dominik Schürmann
f57f5ea032 Better del_rev_dialog_title 2015-08-24 00:49:32 +02:00
Dominik Schürmann
317580039a Better del_rev_dialog_message 2015-08-24 00:48:40 +02:00
Dominik Schürmann
eb381df1fb Merge branch 'master' of github.com:open-keychain/open-keychain 2015-08-24 00:37:47 +02:00
Dominik Schürmann
7ba0b93ceb Move proxy pref values out of strings 2015-08-24 00:37:38 +02:00
Vincent Breitmoser
16903357e1 mention filename to export to in log 2015-08-22 12:22:43 +02:00
Adithya Abraham Philip
0251f0e416 introduced constants for keyserver sync, fixed sync issue 2015-08-20 21:02:29 +05:30
Adithya Abraham Philip
f625a26bbd added on/off summaries 2015-08-20 21:02:29 +05:30
Adithya Abraham Philip
3f8f70b0a9 added sync preferences 2015-08-20 21:02:29 +05:30
Adithya Abraham Philip
6af24527da changed sync name 2015-08-20 21:02:29 +05:30
Adithya Abraham Philip
448657602c improved orbot notify, added periodic sync 2015-08-20 21:02:29 +05:30
Adithya Abraham Philip
1ef6f883e3 introduced keyserver sync adapter 2015-08-20 21:02:29 +05:30
Dominik Schürmann
3d8eda6e3e Improve comments and reasons in PgpConstants, simple checks for insecure asymmetric keys 2015-08-10 09:35:23 +02:00
Dominik Schürmann
dba145f5df Follow some of coorus recommendations: better selection of algo whitelist, ignore recipients preferred algos 2015-08-09 21:49:56 +02:00
Dominik Schürmann
57378be1c0 Introduce constants in OpenPgpSignature and DecryptionResult for unsigned/unencrypted content, update API, introduce simple checks for insecure symmetric algos 2015-08-09 21:49:56 +02:00
Adithya Abraham Philip
37864a9d42 updated OrbotHelper with silent start 2015-08-06 04:40:52 +05:30
Dominik Schürmann
7086a67c2e Merge pull request #1456 from xSooDx/master 
ISSUE #1304: Change keybase strings
 2015-08-05 22:19:40 +02:00
Dominik Schürmann
9afc7f7bab Fix account_privacy_text 2015-08-05 18:19:39 +02:00
Dominik Schürmann
974b7c37d4 Add privacy information to account screen 2015-08-03 15:13:08 +02:00
Thialfihar
e51eff4050 Add theme setting 
This prepares that different themes can be added. Currently light and
dark will just use the default OK theme.
 2015-07-21 20:49:08 +02:00
xSooDx
ef9a1c23f3 -No longer appends the links to the keybase_narratives 
-Now uses '%s' to insert the names in the keybase_narratives
-added '%s' to keybase_narrative_* in the string.xml file
   NOTE:Have not modified for other languages
 2015-07-21 17:13:24 +05:30
Adithya Abraham Philip
c59196a6f1 upload only public key in revocation 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
0cec75fc9d show key name on revoke/delete dialog 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
2827b1af16 added retry on upload failure 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
fcd27d2600 implemented revocation on deletion 2015-07-13 23:34:06 +05:30
Dominik Schürmann
2299c03023 Fix strings nitpicks from transifex 2015-07-09 13:09:47 +02:00
Vincent Breitmoser
20cebc2788 change wording of export dialog, remove "export secret" checkbox 2015-07-08 17:25:07 +02:00
Dominik Schürmann
d4fbaf9397 Rudimentary backup feature 2015-07-08 13:25:07 +02:00
Vincent Breitmoser
5633fcc92f fix symmetric passphrase caching (fixes #1401) 2015-07-08 04:36:43 +02:00
Dominik Schürmann
4837d4cc5c Merge branch 'master' of github.com:open-keychain/open-keychain 2015-07-08 03:12:24 +02:00
Vincent Breitmoser
dad2ba0db8 fix expiry check in edit key ui 2015-07-08 02:34:03 +02:00
Vincent Breitmoser
d9b07625e8 addition of subkeys for divert-to-card primary keys is not supported 2015-07-08 01:42:47 +02:00
Vincent Breitmoser
642f83c1f4 better handling of divert-to-card keys for subkey modifications 2015-07-08 01:41:55 +02:00
Vincent Breitmoser
895d1fbef6 try cache in certify operation (fixes #1242) 2015-07-07 23:41:44 +02:00
Dominik Schürmann
954825a42a Clarifications in remote API code 2015-07-07 23:08:38 +02:00
Dominik Schürmann
e66794969e Package cert not sig 2015-07-07 22:15:15 +02:00