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

181 Commits

Author SHA1 Message Date
Vincent Breitmoser
2cda486427 linked: use webview instead of app, and some minor layoutings 2015-09-02 04:14:45 +02:00
Vincent Breitmoser
b52a0303ca linked: redesign github resource creation, implement ouath flow (WIP) 2015-09-01 06:42:10 +02:00
Vincent Breitmoser
e037b78248 Merge remote-tracking branch 'origin/master' 2015-08-29 13:29:51 +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
2569984601 Merge branch 'master' of https://github.com/mgeier63/open-keychain into mgeier63-master 2015-08-28 17:08:10 +02:00
Dominik Schürmann
7a98ffc90a Remove dead code 2015-08-27 12:34:54 +02:00
mgeier63
d3bda96953 service side support for https://github.com/open-keychain/openpgp-api/pull/3 2015-08-27 09:12:21 +02:00
Adithya Abraham Philip
6af24527da changed sync name 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
0326bbce6b Adpt official theme naming schema 2015-08-12 17:09:07 +02:00
Dominik Schürmann
65517f0d06 Style dialog buttons 2015-08-12 17:00:09 +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
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
d1409fd5c8 use only one DeleteDialogActivity 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
fcd27d2600 implemented revocation on deletion 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
4d81a83baa added proxy support to OperationHelper 2015-07-03 20:46:16 +05:30
Dominik Schürmann
0faf69e91f Subtle design improvements to yubikey dialog 2015-07-03 16:54:17 +02:00
Dominik Schürmann
d03595f64e New NFC dialog design with indeterminate progress, do NFC stuff in background 2015-07-03 04:58:30 +02:00
Adithya Abraham Philip
a5257ec71d Merge branch 'master' of github.com:open-keychain/open-keychain 2015-06-30 22:12:16 +05:30
Dominik Schürmann
7009e504b9 Connect YubiKey URL to OpenKeychain 2015-06-29 21:17:12 +02:00
Dominik Schürmann
a9c606d49b Create key wizard for blank YubiKey 2015-06-29 20:48:11 +02:00
Dominik Schürmann
93e6b6f9b5 Use signature-level signature for TemporaryStorageProvider and describe the security model 2015-06-29 10:54:27 +02:00
Adithya Abraham Philip
1c6ae48a07 renamed KeychainNewService to KeychainService 2015-06-27 01:21:52 +05:30
Adithya Abraham Philip
0012db1f6d deleted KeychainService 2015-06-27 01:21:52 +05:30
Vincent Breitmoser
5e5febaee3 rename activities to match new purpose 2015-06-18 16:28:57 +02:00
Vincent Breitmoser
c11fef6e7c handle multiple input URIs and Intent.SEND_MULTIPLE 2015-06-18 03:10:59 +02:00
Vincent Breitmoser
baea318470 Merge remote-tracking branch 'origin/master' into v/multi-decrypt 2015-06-11 17:12:07 +02:00
Dominik Schürmann
6749b03d9a Fix debug/release build separation 2015-06-11 00:31:41 +02:00
Dominik Schürmann
05fcbcae7b Temporary fix for testDebug 2015-06-10 22:35:06 +02:00
Dominik Schürmann
260364e267 Use authority res strings 2015-06-10 20:00:29 +02:00
Dominik Schürmann
aa31abd93f Allow debug build besides release build 2015-06-10 19:47:29 +02:00
Vincent Breitmoser
074b6633b0 eventbus: initial attempt, replace messenger hack with eventbus communication 2015-06-06 23:17:42 +02:00
Adithya Abraham Philip
6bc40d12ad renamed KeychainIntentService to KeychainService 2015-06-01 17:43:00 +05:30
Dominik Schürmann
b794719020 Version 3.2.3 2015-05-29 02:33:04 +02:00
Dominik Schürmann
43d9e2ba76 Version 3.2.2 2015-05-21 10:34:39 +02:00
Vincent Breitmoser
20a6c5ce8a Merge tag 'v3.2.1' into linked-identities 
Version 3.2.1

Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml
 2015-05-11 17:28:34 +02:00
Dominik Schürmann
5c44f84009 3.2.1 2015-05-10 13:16:37 +02:00
Dominik Schürmann
5b1bf888b4 Reformat manifest 2015-05-10 11:15:10 +02:00
Dominik Schürmann
63022aa96a Version 3.2 2015-05-06 14:32:17 +02:00
Dominik Schürmann
e3f5c6d01e Cleanup manifest 2015-05-05 09:26:57 +02:00
Dominik Schürmann
7c275fed9d API: Allow selection of decryption keys when decryption fails 2015-04-30 18:45:43 +02:00
Vincent Breitmoser
1865852ccc Merge remote-tracking branch 'origin/development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
	OpenKeychain/src/main/res/menu/decrypt_menu.xml
 2015-04-26 01:02:22 +02:00
Vincent Breitmoser
b4aec3114d Merge branch 'development' into linked-identities 
Conflicts:
	Graphics/update-drawables.sh
	OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
 2015-04-24 14:18:01 +02:00
Adithya Abraham Philip
91443c2f43 support for handling keyserver urls from browser, added documentation 2015-04-20 21:42:51 +05:30
Dominik Schürmann
256d644d03 IMplement CryptoInputParcelCacheService 2015-04-13 23:29:35 +02:00
Vincent Breitmoser
a4b7daf266 Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
 2015-04-09 13:57:56 +02:00
Vincent Breitmoser
b0a51e7dd3 remove unused NfcActivity 2015-03-30 23:39:36 +02:00
Vincent Breitmoser
f9ef1160ca Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
 2015-03-24 15:29:58 +01:00