Commit Graph

262 Commits

Author SHA1 Message Date
Dominik Schürmann
7fa2c97cdc Add missing license headers, cleanup 2016-12-05 12:55:16 +01:00
Dominik Schürmann
553f90f145 Merge branch 'master' of github.com:open-keychain/open-keychain 2016-12-04 20:13:19 +01:00
Dominik Schürmann
eed4de9941 Merge branch 'tobsbot-recycler-view' 2016-12-04 20:08:35 +01:00
Tobias Erthal
5cb9de01ad Fixed id offset, minor changes. 2016-12-04 20:02:56 +01:00
Tobias Erthal
ca67c52aa0 Updated 3 files from recycler-view-all 2016-12-04 20:02:49 +01:00
Tobias Erthal
37abe757f0 Check for key status before enabling click events. 2016-12-03 03:45:34 +01:00
Tobias Erthal
848bb01cff Updated SelectSignKeyAdapter.java from recycler-view 2016-12-03 03:45:25 +01:00
Vincent Breitmoser
e9bd8af5d0 break down result handling in OpenPgpService into methods 2016-12-01 13:45:43 +01:00
Tobias Erthal
d7ed998a40 Updated SelectSignKeyAdapter.java from recycler-view 2016-11-30 23:19:11 +01:00
Dominik Schürmann
b02f50dd22 Merge pull request #1953 from open-keychain/openpgp-signature-result-v4
Openpgp signature result v4
2016-11-30 16:28:16 +01:00
Dominik Schürmann
d90b20f550 Merge tobsbot RecyclerView branch 2016-11-30 15:51:32 +01:00
Vincent Breitmoser
52b1016baa update OpenPgpSignatureResult to use enums 2016-11-21 16:05:42 +01:00
Tobias Erthal
a432d59d2c fixed KeyNotFound bug, cosmetic changes 2016-09-21 20:09:57 +02:00
Tobias Erthal
fabd30f6b1 RecyclerView now used in remote fragments. Changes made to the cursor model. A bit more recursive, but better readability in my opinion. 2016-09-14 14:47:02 +02:00
Andrea Torlaschi
5e93b68b6e ImportKeys: Refactoring 2016-08-19 22:35:32 +02:00
Vincent Breitmoser
02a5611ec9 service: don't need a wrapper for the parcelable result after all
Conflicts:
	extern/openpgp-api-lib
2016-06-16 10:46:40 +02:00
Vincent Breitmoser
f234cd614c make OpenPgpDecryptionResult immutable 2016-06-02 18:26:25 +02:00
Vincent Breitmoser
594d1686c9 service: slightly clearer code for backwards compatibility 2016-06-02 17:21:07 +02:00
Vincent Breitmoser
cb11c0ec84 make OpenPgpSignatureResult immutable 2016-06-02 16:04:45 +02:00
Vincent Breitmoser
88b0903bf5 service: support sender address status and list of confirmed user ids to OpenPgpSignatureResult 2016-06-02 15:32:45 +02:00
Vincent Breitmoser
1da8e4c1ed make unencrypted backup an explicit parameter 2016-05-17 20:59:07 +02:00
Alex Fong
7b02161ce7 Slight changes for consistency 2016-05-16 00:59:57 +08:00
Alex Fong
614f46a630 Shifted duplicate method implementations from KeyRing to openpgp-api submodule 2016-05-15 23:26:09 +08:00
Vincent Breitmoser
c59a32b6a7 service: support progress reporting through a messenger in decryptVerify 2016-05-11 16:17:01 +02:00
Andrea Torlaschi
c942d8b2ff PgpSignEncryptOperation refactoring 2016-05-10 23:38:11 +02:00
Dominik Schürmann
b610dd5897 Update openpgp-api-lib 2016-05-07 12:31:25 +03:00
Dominik Schürmann
7dd5e22353 Merge branch 'master' into backup-api
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
	extern/openpgp-api-lib
2016-05-07 12:01:16 +03:00
Vincent Breitmoser
5e9de4447c external-provider: only allow permission check for caller package names 2016-05-06 12:54:35 +02:00
Vincent Breitmoser
6b7a0597af api: add a comment explaining use of wrapperBundle 2016-05-04 11:45:56 +02:00
Vincent Breitmoser
4c063ebe46 api: ACTION_GET_KEY selects by any subkey, rather than just master key id 2016-05-04 11:36:55 +02:00
Dominik Schürmann
adeb1bd3f8 Merge pull request #1819 from 007durgesh219/Issue#1817
Fix Crash when no encryption subkey is available, Issue #1817
2016-04-29 23:19:15 +02:00
Vincent Breitmoser
8e4d68c55a api: allow caching of sessionKey in OpenPgpDecryptResult 2016-04-29 15:46:17 +02:00
Nikita Mikhailov
163aef4c6b Update obsolete Nfc class prefixes 2016-04-16 11:13:51 +06:00
Nikita Mikhailov
28a352a288 OTG: Rename smartcard -> security token 2016-04-15 02:02:11 +06:00
Nikita Mikhailov
38a1c2d3ab OTG: refactor, change nfc prefix to smartcard 2016-04-14 22:48:01 +06:00
Durgesh
8f88efe13f Fix Crash when no encryption subkey is available, Issue #1817
Signed-off-by: Durgesh <007durgesh219@gmail.com>
2016-04-14 11:05:55 +05:30
Vincent Breitmoser
69e6e404bf service: add opportunistic mode to encryption 2016-03-10 18:34:39 +01:00
Dominik Schürmann
67178ef893 fix get key ids by removing another leftover 2016-03-07 00:23:43 +01:00
Vincent Breitmoser
b8a73427bd fix bug from leftover line in openpgpservice 2016-03-07 00:12:17 +01:00
Vincent Breitmoser
4b3d584d1e add v11 to supported api versions 2016-03-02 16:05:52 +01:00
Dominik Schürmann
a2dcb579ff Add backup API 2016-03-01 00:22:19 +01:00
Vincent Breitmoser
6a853f4c84 wip 2016-02-24 11:32:11 +01:00
Vincent Breitmoser
31b27e59ee add ACTION_CHECK_PERMISSION for a simple permission check 2016-02-24 11:31:32 +01:00
Vincent Breitmoser
1c256e9e50 external-provider: add permission check for status query 2016-02-24 11:31:32 +01:00
Vincent Breitmoser
da3167476b external-provider: add (experimental) external provider 2016-02-24 11:31:32 +01:00
Vincent Breitmoser
b1a978d573 split off ApiDataAccessObject from ProviderHelper 2016-02-24 11:31:32 +01:00
Dominik Schürmann
73ce6fc7bb Passthrough of data Intent in methods of ApiPendingIntentFactory instead of constructor 2016-02-23 16:06:54 +01:00
Dominik Schürmann
f54f12c48c Extend documentation, proper method naming, use of deprecated method annotation 2016-02-22 15:19:06 +01:00
Dominik Schürmann
6379ce1faa Use FLAG_IMMUTABLE 2016-02-22 15:06:45 +01:00
Dominik Schürmann
d1eacf9b27 Move PendingIntent creation into factory 2016-02-22 15:06:45 +01:00