Commit Graph

100 Commits

Author SHA1 Message Date
Andrea Torlaschi
4e661886b1 ImportKeys: Changed UI a bit 2016-08-21 16:36:54 +02:00
Andrea Torlaschi
37f91e326c ImportKeys: Move action buttons inside action bar 2016-08-20 16:48:55 +02:00
Andrea Torlaschi
9469d6d6b2 ImportKeys: Use single card for importing all keys 2016-08-20 11:06:43 +02:00
Andrea Torlaschi
f9316c1708 ImportKeys: Remove "Import all keys" from menu
- This feature is now available in a bottom bar when in basic mode
2016-08-19 22:35:57 +02:00
Andrea Torlaschi
28af02c6c7 ImportKeys: Add basic key importing 2016-08-19 22:35:55 +02:00
Andrea Torlaschi
c41b658e8f ImportKeys: Add menu in import fragments
- Move cloud settings to menu
- TODO: Import all keys
2016-08-19 22:35:30 +02:00
Vincent Breitmoser
4df63ccdeb displaytext: add "View Log" option, move "Copy to clipboard" into overflow menu 2016-02-22 22:22:45 +01:00
Vincent Breitmoser
c113103b82 forgot to commit a file to previous commit (thanks travis) 2016-01-13 15:08:31 +01:00
Dominik Schürmann
fd3a1e900e Move edit key configuration to menu 2016-01-11 08:32:41 +01:00
Dominik Schürmann
6fb96ce790 Add change password menu item to view key 2015-12-31 16:29:55 +01:00
Dominik Schürmann
122705c24e Improve linked identity handling 2015-12-31 15:24:56 +01:00
Dominik Schürmann
269330f04f Add activity to edit user ids only 2015-12-30 16:47:42 +01:00
Vincent Breitmoser
aca0cd340b inline-edit: move action mode menu handling int activity 2015-12-27 15:00:14 +01:00
Vincent Breitmoser
00e97586b0 inline subkey editing (wip commit) 2015-12-27 15:00:14 +01:00
Vincent Breitmoser
5b6bc24a0c extend-uid: add option icon for edit action mode 2015-12-27 14:59:33 +01:00
Vincent Breitmoser
3ca8af060b Merge branch 'master' of github.com:open-keychain/open-keychain 2015-11-04 20:24:11 +01:00
Vincent Breitmoser
8feed0b097 bench: add benchmark operation for testing 2015-11-04 19:09:51 +01:00
Dominik Schürmann
8f070e2450 Support for Android 6 ACTION_PROCESS_TEXT 2015-11-02 19:16:24 +01:00
Vincent Breitmoser
4025acd13a enc-export: use BackupActivity for backup from ViewKeyActivity 2015-09-30 14:41:14 +02:00
Dominik Schürmann
63f1b84914 Remove save support for Android < 4.4 (OKC-01-014) 2015-09-24 22:57:11 +02:00
Dominik Schürmann
74281d6203 Confirm design 2015-09-24 18:30:14 +02:00
Vincent Breitmoser
ff2c552aa2 white share icon in log display activity 2015-09-17 16:17:32 +02:00
Vincent Breitmoser
bbbc8dfd86 multidecrypt: black share icon in bottom sheet 2015-09-17 16:17:17 +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
fd6141f0d2 add share item to decrypt file list (#1524) 2015-09-11 04:51:55 +02:00
Vincent Breitmoser
cdf67c3296 share rather than save log files (OKC-01-015) 2015-09-11 03:08:53 +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
1b5afc3247 Experimental word comparison 2015-08-27 21:53:33 +02:00
Vincent Breitmoser
6565adc5cc keylist: show delete as icon in multi-select 2015-07-08 15:24:10 +02:00
Vincent Breitmoser
eab46df9a3 cleanup KeyListFragment, remove export all keys 2015-07-08 14:53:46 +02:00
Dominik Schürmann
d4fbaf9397 Rudimentary backup feature 2015-07-08 13:25:07 +02:00
Adithya Abraham Philip
af3868d547 reworked keyserver preferences with recyclerview 2015-07-02 02:30:49 +05:30
Dominik Schürmann
a9c606d49b Create key wizard for blank YubiKey 2015-06-29 20:48:11 +02:00
Vincent Breitmoser
f9dea31300 implement deletion of files 2015-06-23 17:07:59 +02:00
Vincent Breitmoser
97d45a0faa order menu items for encrypt operations 2015-06-22 14:32:15 +02:00
Vincent Breitmoser
d11b7b58f1 allow encrypting to clipboard in EncryptFileFragment 2015-06-20 03:34:51 +02:00
Vincent Breitmoser
6db9de221c multi-decrypt: working context menu 2015-06-03 16:47:46 +02:00
Vincent Breitmoser
56a75774d0 correctly preserve state in EncryptFilesFragment 2015-05-27 22:55:36 +02:00
Vincent Breitmoser
8dc9773c1e move synchronous encryption into activity, and preserve checkbox state 2015-05-27 22:33:14 +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
Dominik Schürmann
c442d3bd0d Put decrypt result in toolbar, some ui fixes for decrypt 2015-04-26 00:33:26 +02:00
Vincent Breitmoser
96853a15ee revamp decrypt ui 2015-04-24 19:17:05 +02:00
Vincent Breitmoser
ca9ab02b7b revamp decrypt ui 2015-04-24 19:00:33 +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
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
Dominik Schürmann
95f1527afe Fixing crashes with new encrypt ui 2015-03-29 20:37:54 +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
Adithya Abraham Philip
19775c399b introduced multi-threading
refactored oldKeys to updatedKeys

added update all keys, ThreadPoolExecutor

used modified CachedThreadPoolExecutor
2015-03-23 15:34:22 +05:30
Dominik Schürmann
98817d13ee Manage my keys wizard 2015-03-19 17:16:23 +01:00