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

1511 Commits

Author SHA1 Message Date
Vincent Breitmoser
ee81018163 linked: disable DNS resource (for now) 2015-08-31 13:47:00 +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
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
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
55a150ea46 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-08-28 04:20:50 +02:00
Dominik Schürmann
2ad39c27d9 Collapsing Toolbar 2015-08-28 04:20:43 +02:00
Vincent Breitmoser
79a519aba9 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-08-27 23:58:01 +02:00
Dominik Schürmann
1b5afc3247 Experimental word comparison 2015-08-27 21:53:33 +02:00
Vincent Breitmoser
5acdef6551 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-08-27 16:34:17 +02:00
Vincent Breitmoser
e7991e8dc8 use nicer filenames during export 2015-08-27 16:34:08 +02:00
Vincent Breitmoser
9e3c041549 some cleanup in FileHelper, and allow input of filename during export 2015-08-27 16:13:32 +02:00
Dominik Schürmann
3f4150e4ef Fix theme setting 2015-08-27 15:58:33 +02:00
Dominik Schürmann
905e738621 Use SwitchPreference more often 2015-08-27 14:05:58 +02:00
Dominik Schürmann
c292b8d9c3 Experimental features settings reworked 2015-08-27 13:59:26 +02:00
Dominik Schürmann
7a98ffc90a Remove dead code 2015-08-27 12:34:54 +02:00
Dominik Schürmann
ec7a3a7047 Experimental feature setting 2015-08-27 12:24:37 +02:00
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
93d66d39f7 changed orbot notification icons 2015-08-20 21:02:29 +05:30
Adithya Abraham Philip
65a993446c reworked keyserversyncadapterservice flow 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
979605b5de Fix CryptoInputParcel handling for YubiKeys 2015-08-18 10:33:52 +02:00
Vincent Breitmoser
3c8028fc88 apply fixPgpMessage to plaintext/armored decrypt input 2015-08-17 12:38:46 +02:00
Vincent Breitmoser
7004d129a8 display dummy key for empty result, don't display during search 2015-08-14 15:00:19 +02:00
Vincent Breitmoser
b2d447ab32 show dummy item if there are no secret keys 2015-08-14 14:47:20 +02:00
Vincent Breitmoser
94683607d6 always show MainActivity after first-time CreateKeyActivity 2015-08-14 12:55:52 +02:00
Dominik Schürmann
01e68e044c Lock orientation for yubikey operations 2015-08-12 21:26:15 +02:00
Dominik Schürmann
2edb5349b0 Change license of NfcOperationActivity and fix copyright in BaseNfcActivity 2015-08-12 20:30:34 +02:00
Dominik Schürmann
d14e0b2ed3 Fix theme bugs 2015-08-12 20:25:58 +02:00
Dominik Schürmann
483d5ab495 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-08-12 17:09:15 +02:00
Dominik Schürmann
0326bbce6b Adpt official theme naming schema 2015-08-12 17:09:07 +02:00
Vincent Breitmoser
3a5ea0f135 show result error in cachingcryptooperationfragment (related #1445) 2015-08-12 16:20:52 +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
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
xSooDx
ee5343fcb6 renamed the insertLinks() method to formatSpannableString() and added comment about its functionality 2015-08-04 16:24:12 +05:30
Dominik Schürmann
460f0d5f33 Update libs 2015-08-03 19:09:59 +02:00
Dominik Schürmann
7474268ead Fix color and design in help activity 2015-08-03 13:24:04 +02:00
Dominik Schürmann
04f771a4f7 Fix crash with new theme 2015-07-25 15:46:36 +02:00
Thialfihar
a4470abc10 Refactor theme selection of dialogs 
This makes sure the dark theme also uses dark dialogs.
 2015-07-21 22:47:55 +02:00
Thialfihar
313188c695 Fix key view toolbar and status colour 
The status bar wrongly used the same colour as the toolbar, making it
indistinguishable from it. This calculates the status bar colour based
on the toolbar colour.
 2015-07-21 22:47:55 +02:00
Thialfihar
306d20f977 Refactor theme changing to avoid code repetition 2015-07-21 20:56:42 +02:00
Thialfihar
86d95e4d40 Refactor theme preference values into constants 
Also explicitly set a theme via preference updating to the default.
 2015-07-21 20:56:42 +02:00
Thialfihar
8d2cd33339 Upgrade MaterialDrawer to 3.0.9 2015-07-21 20:56:42 +02:00
Thialfihar
680799caa7 Fix drawer background color for ViewKeyActivity 2015-07-21 20:56:42 +02:00