moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-19 07:15:06 -05:00
Code Issues Releases Wiki Activity
ca4774fd62
open-keychain/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
History
Vincent Breitmoser ca4774fd62 Merge remote-tracking branch 'origin/master' into canonicalize 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
	OpenKeychain/src/main/res/values/strings.xml
	settings.gradle
2014-06-13 00:27:40 +02:00
..
ContactSyncAdapterService.java Fixing TAG and string resource 2014-06-06 17:39:11 +02:00
DummyAccountService.java Fix TAG in account service as well 2014-06-06 17:42:28 +02:00
KeychainIntentService.java Merge remote-tracking branch 'origin/master' into canonicalize 2014-06-13 00:27:40 +02:00
KeychainIntentServiceHandler.java Removed unused Toast import 2014-05-11 22:20:44 +02:00
OldSaveKeyringParcel.java rename SaveKeyringParcel to OldSaveKeyringParcel 2014-05-27 13:53:01 +02:00
OperationResultParcel.java canonicalize: require primary key binding certificates for signing subkeys 2014-06-12 23:10:44 +02:00
OperationResults.java import-log: properly distinguish return states 2014-06-12 12:36:58 +02:00
PassphraseCacheService.java new savekeyring operation (mostly stub) 2014-05-27 13:56:30 +02:00
SaveKeyringParcel.java new savekeyring operation (mostly stub) 2014-05-27 13:56:30 +02:00