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

2864 Commits

Author SHA1 Message Date
Vincent Breitmoser
9fd5e966f6 linked: don't need javascript, so we don't enable it 2015-09-10 02:23:49 +02:00
Vincent Breitmoser
0f4af7d2ed linked: fix screwups from last commit, sigh 2015-09-10 02:11:43 +02:00
Vincent Breitmoser
7fa1afe430 linked: work on github lid creation error handling 2015-09-10 01:45:59 +02:00
Vincent Breitmoser
cf7035ccbe linked: fix auth token revocation (maybe?) 2015-09-08 15:55:21 +02:00
Vincent Breitmoser
c07e029345 linked: add "retry" 2015-09-08 15:55:17 +02:00
Vincent Breitmoser
0ef929fb7f linked: move between fixed states 2015-09-08 15:53:05 +02:00
Vincent Breitmoser
0db1495ea1 statusindicator: method to set states by name 2015-09-08 15:51:27 +02:00
Vincent Breitmoser
bb7efe0ce9 linked: fix button margins in select dialog 2015-09-08 15:51:01 +02:00
Vincent Breitmoser
a5eea6c200 linked: move client id and secret into static vars (build vars later) 2015-09-08 14:46:18 +02:00
Vincent Breitmoser
79f6ade240 fix unit test for linked ids 2015-09-06 01:29:39 +02:00
Vincent Breitmoser
d2ce770c1a Merge branch 'master' of github.com:open-keychain/open-keychain 2015-09-06 00:59:12 +02:00
Vincent Breitmoser
8e60bf70a1 linked: clear cookies and don't save form data in oauth webview 2015-09-06 00:59:06 +02:00
Vincent Breitmoser
31cfbdc5d2 linked: fix "navigate up" in LinkedIdWizard (imperfect) 2015-09-06 00:58:13 +02:00
Vincent Breitmoser
60e9141b86 linked: basic shared element transition 2015-09-06 00:49:19 +02:00
Dominik Schürmann
afda9d86f8 Merge pull request #1522 from 0-kaladin/mipmap 
Fixes #1520
 2015-09-05 23:27:03 +02:00
Kaladin Light
398dd3519c Fixes #1520 
Move debug launcher icons to mipmap
 2015-09-05 14:24:08 -04:00
Dominik Schürmann
e9836372b4 Use new HashSet<>(Arrays.asList()) instead of static 2015-09-04 13:39:03 +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
2cda486427 linked: use webview instead of app, and some minor layoutings 2015-09-02 04:14:45 +02:00
Vincent Breitmoser
87f7fe65a8 linked: fix back button in github dialog 2015-09-01 14:11:04 +02:00
Vincent Breitmoser
19c9fcc2c9 linked: order selection dialog alphabetically 2015-09-01 14:07:04 +02:00
Vincent Breitmoser
676b393542 statusindicator: don't redisplay child with animation if already shown 2015-09-01 13:59:17 +02:00
Vincent Breitmoser
1b3f70073a linked: smooth over progress with tactical pauses 2015-09-01 13:58:52 +02:00
Vincent Breitmoser
6225c940f9 linked: redesign github resource creation, implement ouath flow 2015-09-01 13:58:04 +02:00
Vincent Breitmoser
47ef8cbe55 fix missing date in CryptoInputParcel in some cases (could be a bigger problem!) 2015-09-01 13:48:49 +02:00
Vincent Breitmoser
2aa424dd4d linked: use link icon from octo set? not sure yet.. 2015-09-01 07:46:37 +02:00
Vincent Breitmoser
66b9c167d6 linked: update icon design of github l-id creation 2015-09-01 07:37:49 +02:00
Vincent Breitmoser
3e55fca0e5 linked: work on github design 2015-09-01 07:09:53 +02:00
Vincent Breitmoser
b52a0303ca linked: redesign github resource creation, implement ouath flow (WIP) 2015-09-01 06:42:10 +02:00
Vincent Breitmoser
9668abfe9e add simple StatusIndicator widget 2015-09-01 06:40:28 +02:00
Vincent Breitmoser
261c83043b linked: Github -> GitHub (fixes #1513) 2015-08-31 14:24:13 +02:00
Vincent Breitmoser
36f8e9f563 linked: fix small typo 2015-08-31 13:48:40 +02:00
Vincent Breitmoser
ee81018163 linked: disable DNS resource (for now) 2015-08-31 13:47:00 +02:00
Dominik Schürmann
bff302f808 Show linked identity menu item and linked identities only when feature is enabled 2015-08-29 17:27:04 +02:00
Dominik Schürmann
feef4a93ab Reword experimental settings 2015-08-29 17:19:58 +02:00
Vincent Breitmoser
c1cc27366c move stray test file to correct position 2015-08-29 13:36:35 +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
3c25dc2b0c Improve decrypt strings 2015-08-28 17:47:56 +02:00
Dominik Schürmann
8a780c9c49 Support OpenPGP API v9 2015-08-28 17:46:57 +02:00
Dominik Schürmann
76522d90fa Cleanup OpenPgpService2 code, update openpgp-api lib 2015-08-28 17:14:40 +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
765ec094c9 Make keybase an experimental feature 2015-08-28 15:18:11 +02:00
Dominik Schürmann
905148f586 Add missing scrim drawable 2015-08-28 14:25:20 +02:00
Dominik Schürmann
6fa5f0b129 introduce text protection and fix color change after confirm 2015-08-28 14:22:52 +02:00
Dominik Schürmann
bff9aa1401 Remove old comment 2015-08-28 13:50:12 +02:00
Dominik Schürmann
333ba5d032 Improve scrolling in key view 2015-08-28 13:10:30 +02:00
Dominik Schürmann
0aaa93ac04 Dont show FAB for expired, revoked keys 2015-08-28 11:50:13 +02:00
Dominik Schürmann
20f652350a Improve certify strings 2015-08-28 10:41:45 +02:00
Dominik Schürmann
55a150ea46 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-08-28 04:20:50 +02:00