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

210 Commits

Author SHA1 Message Date
Dominik Schürmann
a5ff2f8fe3 Mime type consistency 2015-10-15 19:56:04 +02:00
Dominik Schürmann
c0cd872954 Show the Internal Storage menu item on openFile 2015-10-15 19:19:43 +02:00
Vincent Breitmoser
759ffc5a4b Merge branch 'master' into encrypted-export 2015-10-09 14:57:54 +02:00
Vincent Breitmoser
83fef47ec8 make openInputStreamSafe static and move to FileHelper 2015-10-09 01:44:40 +02:00
Vincent Breitmoser
6cf7e3e541 Merge branch 'master' into encrypted-export 2015-10-08 20:05:56 +02:00
Dominik Schürmann
1328309009 Remove ShareHelper: Not compat with Android >= 5, reduce code complexity 2015-10-08 18:47:28 +02:00
Vincent Breitmoser
c630fe651f use annotations for android sdk constraints 2015-09-28 18:50:20 +02:00
Vincent Breitmoser
0e613aff2e Merge remote-tracking branch 'origin/master' into encrypted-export 2015-09-28 18:27:29 +02:00
Vincent Breitmoser
46e24058ba export: support encrypted export, first version 2015-09-28 00:03:11 +02:00
Vincent Breitmoser
04fd2eeb79 remove "export to file" code path from export operation 2015-09-26 02:22:32 +02:00
Dominik Schürmann
3df9bea455 Harden parsing of keyserver results (OKC-01-003) 2015-09-25 02:22:23 +02:00
Dominik Schürmann
756ee28fb0 Cleanup FileHelper 2015-09-24 23:15:19 +02:00
Dominik Schürmann
63f1b84914 Remove save support for Android < 4.4 (OKC-01-014) 2015-09-24 22:57:11 +02:00
Dominik Schürmann
f924e7d40c Fix some illegal state exceptions 2015-09-24 19:03:33 +02:00
Dominik Schürmann
9ee61dc0df Pin keybase certificate 2015-09-21 14:05:49 +02:00
Dominik Schürmann
ad2c8867e6 Use more modular Keybase lib with OkHttp wrapper 2015-09-21 12:49:02 +02:00
Dominik Schürmann
0b181743a3 Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on add (OKC-01-018) 2015-09-20 22:42:50 +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
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
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
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
e3d1f68e79 trigger indexing of file after operation (#1498) 2015-08-22 12:54:19 +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
65a993446c reworked keyserversyncadapterservice flow 2015-08-20 21:02:29 +05:30
Dominik Schürmann
01e68e044c Lock orientation for yubikey operations 2015-08-12 21:26:15 +02:00
Adithya Abraham Philip
37864a9d42 updated OrbotHelper with silent start 2015-08-06 04:40:52 +05:30
Thialfihar
3a810676fc Fix preference version handling 
Move preference upgrade of theme to version 4 of the preferences. The
upgrade is meant FROM that version to the next.
 2015-07-21 20:56:42 +02:00
Thialfihar
1183d6f30c Use a constant for the default value of the theme 2015-07-21 20:56:42 +02:00
Thialfihar
3b67c9d894 Rename updatePreferences() to upgradePreferences() 
This is really an upgrade of the preference store and not an update of
values, it also is consistent with SQLiteOpenHelper.onUpgrade().
 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
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
Vincent Breitmoser
96dbb9e60c add pseudo-static id property to CryptoOperationHelper 2015-07-09 11:51:38 +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
Adithya Abraham Philip
be6b7ff899 shifted proxy checking to ImportKeysListCloudLoader 2015-07-08 07:47:24 +05:30
Adithya Abraham Philip
aca106e808 fixed OrbotRequiredDialogActivity not finishing, orbot install dialog style 2015-07-03 20:46:16 +05:30
Adithya Abraham Philip
89f017aa9c reformatted code 2015-07-03 20:46:16 +05:30
Adithya Abraham Philip
4d81a83baa added proxy support to OperationHelper 2015-07-03 20:46:16 +05:30
Adithya Abraham Philip
1856ca385d fixed middleButton parameter being ignored 2015-07-03 20:46:16 +05:30
Adithya Abraham Philip
c95fa9fdc1 renamed to clarify necessity for two install dialog fragments 2015-07-03 20:46:16 +05:30
Dominik Schürmann
c74d6fc710 Rename package back to orbot because these are orbot utils 2015-07-03 20:46:16 +05:30
Dominik Schürmann
c419885434 Cleanup tor code 2015-07-03 20:46:16 +05:30
Adithya Abraham Philip
2402c6d3c7 ensuring code style is preserved 2015-07-03 20:46:15 +05:30
Adithya Abraham Philip
79fc0f97ea added proxy to all import operations using KeychainService 2015-07-03 20:46:15 +05:30
Adithya Abraham Philip
65ca77c3cb orbot dialog fragments added 2015-07-03 20:46:15 +05:30
Adithya Abraham Philip
31fac3080e removed NetCipher submodule, copied classes 2015-07-03 20:46:15 +05:30
Adithya Abraham Philip
dbc3f90360 fixed Proxy generation, proxy working for for cloud import 2015-07-03 20:46:15 +05:30