cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,816 Commits 1 Branch 0 Tags
f52e4a8c7f6fc62da384fa53b497a42dd0e258c5
Commit Graph
665 Commits
Author SHA1 Message Date
Vincent Breitmoser 783dae8804 add ecc support 2014-08-24 16:08:37 +02:00
Dominik Schürmann 5f8bbab569 Scroll fixes for certify activity 2014-08-19 16:31:51 +02:00
Dominik Schürmann c1a265bfd1 certs header design 2014-08-19 10:01:31 +02:00
Dominik Schürmann 638c29792d Header for certs view 2014-08-19 09:52:15 +02:00
Dominik Schürmann 3e7ce0008f Fixes for expiry UI 2014-08-18 11:02:41 +02:00
Vincent 56fb822034 Merge pull request #772 from mar-v-in/issue-729 
Remove NoSwipeWrapContentViewPager
 2014-08-17 15:46:27 +02:00
mar-v-in 3cc57a092a Remove NoSwipeWrapContentViewPager 2014-08-17 11:07:34 +02:00
Dominik Schürmann bbe986743c API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix pre-selection of key ids (no revoked or expired ones, also select duplicates), refactor text using spannables 2014-08-16 05:28:51 +02:00
Dominik Schürmann 28df004cbb Merge pull request #767 from mar-v-in/issue-763 
Use dropdown in CertifyActivity
 2014-08-14 18:53:40 +02:00
Dominik Schürmann 05da0f4328 change keybase hint following pull request #755 2014-08-14 16:20:24 +02:00
Dominik Schürmann 9ad09a3982 Automcomplete names and emails in keyserver tab 2014-08-14 16:12:42 +02:00
mar-v-in a6118877ff Add and use CertifyKeySpinner 2014-08-14 16:02:28 +02:00
mar-v-in ef2449917e factor KeySpinner out 2014-08-14 16:02:27 +02:00
Dominik Schürmann c7d5b09286 Move certify action down into actions section 2014-08-13 21:23:01 +02:00
Dominik Schürmann 1455af2eed Edit key: key flags 2014-08-05 22:35:37 +02:00
Dominik Schürmann 39380a3617 More work on add subkey dialog design 2014-08-05 18:42:55 +02:00
Dominik Schürmann 04cdd45e1a Work on add subkey dialog design 2014-08-05 18:35:48 +02:00
Dominik Schürmann 369f6e080c Refactor expiry dialog 2014-08-05 15:07:11 +02:00
Dominik Schürmann a2c1221397 Fixing lint complaints, removing unused resources 2014-08-04 16:29:16 +02:00
Dominik Schürmann b42afcd32c Fix debug backup/restore methods 2014-08-04 11:19:46 +02:00
Dominik Schürmann fb5c829ff7 Remove old edit key stuff 2014-08-04 02:31:54 +02:00
Dominik Schürmann 7f463ae0df Edit key: subkey adding, not finished 2014-08-04 02:26:34 +02:00
Dominik Schürmann 4979ccd645 Smaller UI fixes 2014-08-04 00:49:16 +02:00
Dominik Schürmann c2ca841ac9 Merge pull request #728 from mar-v-in/improve-file-more 
Improve file encrypt
 2014-08-04 00:21:59 +02:00
mar-v-in d4f2d3842b Minor cleanup 2014-08-02 04:16:26 +02:00
mar-v-in e17c1a0cd4 Fix focusing with To field 2014-08-02 00:52:34 +02:00
mar-v-in 9d101b4fe5 Encrypt UI (drop downs) 2014-08-01 23:30:31 +02:00
Dominik Schürmann c9b028804c Add user id with dialog 2014-08-01 17:47:07 +02:00
mar-v-in fc2a1f5838 Merge branch 'master' into improve-file-more 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
 2014-08-01 05:29:40 +02:00
Dominik Schürmann 79f69f2fce Start fixing CachedPublicKeyRing 2014-08-01 00:38:36 +02:00
Vincent Breitmoser 3d7cdf5428 move upload/update buttons from menu to buttons 2014-07-31 23:49:53 +02:00
mar-v-in c71cdc1432 Fix string resources 2014-07-31 23:36:37 +02:00
mar-v-in 36d8c9f608 Fix merge 2014-07-31 23:20:43 +02:00
mar-v-in eae7c711a3 Merge branch 'master' into improve-file-more 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
 2014-07-31 23:19:01 +02:00
Dominik Schürmann db70fcfdbf Create key: design fixes 2014-07-31 23:13:29 +02:00
mar-v-in 0c7eea225b - add multi select for storage api (kitkat) 
- UI fixes
- refactoring
 2014-07-31 22:21:46 +02:00
Dominik Schürmann 50aea621ba Fix animations in create key 2014-07-31 21:51:35 +02:00
Dominik Schürmann b9694ae9c5 Add notify layouts to some activities 2014-07-31 21:29:45 +02:00
Dominik Schürmann 138d5a1d9c Robots like coffee too... 2014-07-31 21:18:24 +02:00
Dominik Schürmann b052d5e89c Smaller notes 2014-07-31 18:42:54 +02:00
Dominik Schürmann 65488cbf05 Create key: work on upload 2014-07-30 17:47:17 +02:00
Dominik Schürmann fcc535a573 Create key: repeat passphrase 2014-07-30 15:29:01 +02:00
Dominik Schürmann 052cdfa392 Create key: upload 2014-07-30 15:19:33 +02:00
Dominik Schürmann e46d72ba27 Fix drawer in key list 2014-07-30 14:59:12 +02:00
Dominik Schürmann cdee62b79d Create key: layout above buttons 2014-07-30 01:13:02 +02:00
Dominik Schürmann 9f9aa79066 Fix conflicts 2014-07-30 01:07:10 +02:00
Dominik Schürmann 43b8170a44 Merge branch 'master' of github.com:open-keychain/open-keychain 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
 2014-07-30 00:58:28 +02:00
Dominik Schürmann 6448de8f6a Create key with fragments 2014-07-30 00:50:53 +02:00
Vincent Breitmoser 377d0f09fa Merge branch 'ditch-appmsg' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
 2014-07-29 13:53:18 +02:00
Dominik Schürmann cce243299a Fix build by removing old icon reference 2014-07-28 16:26:06 +02:00