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

519 Commits

Author SHA1 Message Date
Adithya Abraham Philip
160362d2bf prevent rare KeyserverSyncAdapterService crash 2016-01-27 23:58:55 +05:30
Vincent Breitmoser
e66c27c081 passphrasecache: update defaults, add "forever" setting 2016-01-11 17:30:03 +01:00
Dominik Schürmann
0fd5b45df9 Use more generic 'Security Token' where possible, add sutitle to create key what tokens are supported 2016-01-10 17:17:57 +01:00
Vincent Breitmoser
f2ef65ac37 add method to skip caching 2016-01-06 16:25:52 +01:00
Vincent Breitmoser
7eafe5d1e8 inline-ttl: support "screen off" in preference 2016-01-06 16:25:50 +01:00
Vincent Breitmoser
52ab77d2a4 passcache: add support for clear on screen lock (ttl == 0) 2016-01-06 16:25:48 +01:00
Vincent Breitmoser
a75b26be66 inline-ttl: use ttl preference in ttl spinner 2016-01-06 16:24:13 +01:00
Vincent Breitmoser
1754a88ac3 inline-ttl: create ttl choice customization setting activity 2016-01-06 16:24:12 +01:00
Vincent Breitmoser
840d57bf3b passphraseactivity: add inline spinner to password dialog 2016-01-06 16:24:07 +01:00
Dominik Schürmann
35e16b75b2 Follow notification style guidelines, dismiss permission notification on click 2015-12-22 01:46:11 +01:00
Dominik Schürmann
6c25cb1927 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-12-21 20:32:02 +01:00
Dominik Schürmann
e7c9be9556 Make ContactHelper less static 2015-12-21 20:31:23 +01:00
Adithya Abraham Philip
7d05a22ae5 fixed key update preference not turning off 2015-12-21 01:28:28 +05:30
Adithya Abraham Philip
f29280bbb2 added Facebook links support, reworked Preferences 2015-12-06 00:46:52 +05:30
Dominik Schürmann
c4f11c4535 Fix strings, thanks to Alain-Olivier 2015-11-23 23:39:56 +01:00
Dominik Schürmann
dfed60f442 re-enable contact sync by default 2015-11-23 23:27:01 +01:00
Dominik Schürmann
eda53d42de Disable contact sync by default on Android >= 6 2015-11-23 11:43:44 +01:00
Dominik Schürmann
c5bcbce28f Show notification when READ_CONTACTS permission is denied in sync service, hide linked contact card if permission is denied 2015-11-23 09:06:12 +01:00
Vincent Breitmoser
3ca8af060b Merge branch 'master' of github.com:open-keychain/open-keychain 2015-11-04 20:24:11 +01:00
Vincent Breitmoser
8feed0b097 bench: add benchmark operation for testing 2015-11-04 19:09:51 +01:00
Adithya Abraham Philip
4284aac0aa changed KeyserverSyncAdapterService to work with START_REDELIVER_INTENT 2015-10-31 00:21:13 +05:30
Vincent Breitmoser
a1330f78e4 uploadop: clean up, add logging 2015-10-29 14:50:29 +01:00
Dominik Schürmann
8f565296b9 Integrate yubikey reset method 2015-10-16 15:30:06 +02:00
Dominik Schürmann
4f2e02d606 Remove default PIN setting 2015-10-16 13:43:21 +02:00
Dominik Schürmann
cac7c3234a Support backupVersion ASCII Armor header 2015-10-15 22:50:34 +02:00
Dominik Schürmann
53680b6213 Cleanup, fix advanced sharing 2015-10-15 21:48:01 +02:00
Vincent Breitmoser
97b2178a29 upload: re-add upload by bytes 2015-09-28 18:03:58 +02:00
Vincent Breitmoser
46e24058ba export: support encrypted export, first version 2015-09-28 00:03:11 +02:00
Vincent Breitmoser
dc9e068790 upload: identify key by masterKeyId only 2015-09-26 18:10:30 +02:00
Vincent Breitmoser
c93670f3c6 export: externalize upload into its own operation 2015-09-26 03:21:53 +02:00
Vincent Breitmoser
04fd2eeb79 remove "export to file" code path from export operation 2015-09-26 02:22:32 +02:00
Vincent Breitmoser
99fd1f4c22 preliminary working mime parsing in DecryptListFragment! (beware WIP, here be dragons!) 2015-09-16 00:05:21 +02:00
Vincent Breitmoser
3cd54581c3 mime: create more general InputDataOperation, which for now and does basic mime parsing 2015-09-15 03:02:05 +02:00
Vincent Breitmoser
3814ae7d53 Merge branch 'master' into mime4j 
Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
	OpenKeychain/src/main/res/values/strings.xml
 2015-09-14 16:21:04 +02:00
Kaladin Light
dd850e5c72 Fixes open-keychain/open-keychain#1515 
Move launcher icons to mipmap
 2015-09-03 13:25:09 -04: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
7a98ffc90a Remove dead code 2015-08-27 12:34:54 +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
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
dbaf7070ea WIP mime parsing 2015-08-17 09:31:34 +02:00
Dominik Schürmann
974b7c37d4 Add privacy information to account screen 2015-08-03 15:13:08 +02:00
Adithya Abraham Philip
771d654766 made mSignatureTime optional in CryptoOperationHelper 2015-07-15 07:34:03 +05:30
Adithya Abraham Philip
b61a7d5535 added licenses, cleaned up code, fixed warnings 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
faa66d6140 prevented passphrase caching on revocation 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
fcd27d2600 implemented revocation on deletion 2015-07-13 23:34:06 +05:30