cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,734 Commits 1 Branch 0 Tags
f8e6e0841014f21fc813d451dcdd608745205876
Commit Graph
957 Commits
Author SHA1 Message Date
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 6fa5f0b129 introduce text protection and fix color change after confirm 2015-08-28 14:22:52 +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 2ef691b264 Fix theme problems 2015-08-18 11:19:50 +02:00
Dominik Schürmann dbaf7070ea WIP mime parsing 2015-08-17 09:31:34 +02:00
Dominik Schürmann d14e0b2ed3 Fix theme bugs 2015-08-12 20:25:58 +02:00
Dominik Schürmann 0326bbce6b Adpt official theme naming schema 2015-08-12 17:09:07 +02:00
Dominik Schürmann 65517f0d06 Style dialog buttons 2015-08-12 17:00:09 +02:00
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
Dominik Schürmann 3dbe0033dc Merge pull request #1473 from open-keychain/orbot-helper 
Updated OrbotHelper with the latest NetCipher
 2015-08-06 10:34:13 +02:00
Adithya Abraham Philip 37864a9d42 updated OrbotHelper with silent start 2015-08-06 04:40:52 +05:30
Adithya Abraham Philip f17dabce8c fixed crash on api < 21 due to drawable using attrs 2015-08-06 02:02:11 +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 d359431662 Fix color of selected text in drawer menu for light theme 
The MaterialDrawerTheme.Light.ActionBar makes the drawer icon in the top
left black for some reason. A work-around is to set the primary colour
back to green, so it will be used for Theme.AppCompat.Light and override
the selected text colour for the dark theme.
 2015-07-21 20:56:42 +02:00
Thialfihar e281fef1f1 Lowercase colors for consistency 2015-07-21 20:56:42 +02:00
Thialfihar 8227db3778 Make tab text and indicator themeable 2015-07-21 20:56:42 +02:00
Thialfihar 506630552a Make CardView background themeable 
However, CardViews displaying QR codes keep a fixed white background.
 2015-07-21 20:56:41 +02:00
Thialfihar 1c3fbe9bbe Make bright toolbar themeable 
Also remove a superfluous divider in the decrypt files fragment and the
unused drawer_custom_header.xml.

This changes the color of the toolbar in the light theme as well,
because its brightness didn't play well with the system status bar of
Android, drowning it in whiteness. Now it is still very light, but the
system bar is still faintly visible above it.
 2015-07-21 20:56:41 +02:00
Thialfihar 7fab951175 Remove color black, as it isn't needed anymore 2015-07-21 20:56:41 +02:00
Thialfihar b60842a35b Make main text color themeable 2015-07-21 20:56:39 +02:00
Thialfihar 0af7d3c50b Give password strength indicator colors their own name 
Also prune the android color definitions, most of which aren't used.
 2015-07-21 20:56:21 +02:00
Thialfihar dfe5a64fb0 Give key flag colors their own color names 
This removes "bg_gray" and selector_transparent_button.xml, which is
unused and the last file to reference "bg_gray".
 2015-07-21 20:56:12 +02:00
Thialfihar 6b8127ca94 Make cardview header divider themeable 2015-07-21 20:50:32 +02:00
Thialfihar 9f3ecf6bc0 Make log background themeable 2015-07-21 20:50:32 +02:00
Thialfihar 0f6acbd030 Make FAB colors themeable 2015-07-21 20:50:32 +02:00
Thialfihar fe9c802bbb Make button row background themeable 2015-07-21 20:50:32 +02:00