Commit Graph

586 Commits

Author SHA1 Message Date
Vincent Breitmoser
bc09d290f8 enc-export: localization, and layout compatibility 2015-09-29 03:25:36 +02:00
Vincent Breitmoser
4923f08152 enc-export: rename fragment to match class 2015-09-29 02:15:33 +02:00
Vincent Breitmoser
0e613aff2e Merge remote-tracking branch 'origin/master' into encrypted-export 2015-09-28 18:27:29 +02:00
Vincent Breitmoser
00783d7756 enc-backup: didn't like the check mark icon after all 2015-09-25 04:25:08 +02:00
Vincent Breitmoser
f30ca1e92c enc-backup: use black check icon for button, and some cleanup 2015-09-25 04:17:47 +02:00
Vincent Breitmoser
35ef837286 enc-backup: use only one fragment after all 2015-09-25 03:38:53 +02:00
Vincent Breitmoser
edd1e45db7 enc-backup: handle bad code more nicely 2015-09-25 01:38:22 +02:00
Vincent Breitmoser
408c4a896c enc-backup: ask for backup code again 2015-09-25 01:38:13 +02:00
Dominik Schürmann
74281d6203 Confirm design 2015-09-24 18:30:14 +02:00
Dominik Schürmann
0b181743a3 Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on add (OKC-01-018) 2015-09-20 22:42:50 +02:00
Vincent Breitmoser
d94ebb2269 encrypted export WIP 2015-09-19 15:29:44 +02:00
Dominik Schürmann
82ee9d440b Use material overflow icon in decrypt list
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
	OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
2015-09-17 16:24:20 +02:00
Vincent Breitmoser
ece06b1933 multidecrypt: use bottom sheet for longclick options 2015-09-16 19:52:26 +02:00
Vincent Breitmoser
97c55ee4bb multidecrypt: context menu per card, not per file 2015-09-16 17:47:16 +02:00
Vincent Breitmoser
24f2a9468c multidecrypt: display all outputUris as individual items 2015-09-16 02:56:14 +02:00
Vincent Breitmoser
81ce075df9 multidecrypt: prepare viewholder for file list 2015-09-16 02:19:23 +02:00
Vincent Breitmoser
c6f1f505bb linked: ditch create dns fragment (for now) 2015-09-10 12:17:25 +02:00
Vincent Breitmoser
178aea6b90 linked: localization for github creation 2015-09-10 11:46:31 +02:00
Vincent Breitmoser
c07e029345 linked: add "retry" 2015-09-08 15:55:17 +02:00
Vincent Breitmoser
bb7efe0ce9 linked: fix button margins in select dialog 2015-09-08 15:51:01 +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
60e9141b86 linked: basic shared element transition 2015-09-06 00:49:19 +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
6225c940f9 linked: redesign github resource creation, implement ouath flow 2015-09-01 13:58:04 +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
ee81018163 linked: disable DNS resource (for now) 2015-08-31 13:47:00 +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
765ec094c9 Make keybase an experimental feature 2015-08-28 15:18:11 +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
2ad39c27d9 Collapsing Toolbar 2015-08-28 04:20:43 +02:00
Dominik Schürmann
1b5afc3247 Experimental word comparison 2015-08-27 21:53:33 +02:00
Dominik Schürmann
cac0f8ec9e Prettify settings, rename some strings 2015-08-27 15:53:29 +02:00
Dominik Schürmann
2ef691b264 Fix theme problems 2015-08-18 11:19:50 +02:00
Vincent Breitmoser
b2d447ab32 show dummy item if there are no secret keys 2015-08-14 14:47:20 +02:00
Dominik Schürmann
7474268ead Fix color and design in help activity 2015-08-03 13:24:04 +02:00
Dominik Schürmann
e0a381a00d Restore fab colors in key list 2015-07-25 15:47:49 +02:00
Thialfihar
31eece0e27 Update recent decrypt changes to use new theme attributes 2015-07-21 20:56:42 +02:00
Thialfihar
8227db3778 Make tab text and indicator themeable 2015-07-21 20:56:42 +02:00
Thialfihar
e267daf602 Make import keys activity honour the theme
This changes the light theme slightly as well, it uses the actual
background instead of pure white and removes the thick superfluous
divider on top.
The divider at the bottom now has no margin, making the separation from
the FrameLayout on top more consistent, especially when there is
scrollable content.
2015-07-21 20:56:41 +02:00
Thialfihar
506630552a Make CardView background themeable
However, CardViews displaying QR codes keep a fixed white background.
2015-07-21 20:56:41 +02:00