Commit Graph

718 Commits

Author SHA1 Message Date
Dominik Schürmann
c2e7c2416f Remove tabs from import keys activity 2014-10-25 22:05:55 +02:00
Dominik Schürmann
71e3fb5380 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 21:15:12 +02:00
Dominik Schürmann
0abfff0b0e Fixes and icons for apps list, also add Password Store 2014-10-25 21:15:05 +02:00
Vincent Breitmoser
26bd847c32 shorter certification explanation 2014-10-25 03:18:54 +02:00
Vincent Breitmoser
ce4b8edaab more rewording 2014-10-25 03:18:54 +02:00
Vincent Breitmoser
748049fb5b slightly change wording in merge logs 2014-10-25 02:50:48 +02:00
Vincent Breitmoser
c5028dc9ce Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 02:49:37 +02:00
Vincent Breitmoser
30d0afa363 change the way merging is logged 2014-10-25 02:45:16 +02:00
Dominik Schürmann
e332c664cf Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 02:38:09 +02:00
Dominik Schürmann
33b54ab03e Safe slinger activity preps 2014-10-25 02:38:06 +02:00
Vincent Breitmoser
ba724353e5 more work on import logging 2014-10-25 02:13:02 +02:00
Vincent Breitmoser
478b2a4d8b add logging to import and change order of import, keyservers first 2014-10-25 01:59:15 +02:00
Dominik Schürmann
1cbedb60d6 Qr code button text 2014-10-24 00:44:26 +02:00
Dominik Schürmann
b1c164bde0 remove space in on large devices in layouts where no drawer nav is shown 2014-10-24 00:39:33 +02:00
Dominik Schürmann
bfc3774f02 Merge pull request #973 from timbray/development
Make the Certify screen a little more self-explanatory
2014-10-24 00:23:40 +02:00
Dominik Schürmann
1624cd8349 Start safe slinger activity 2014-10-23 23:31:50 +02:00
Tim Bray
d4fb71cb76 reword sync message 2014-10-22 08:19:13 -07:00
Tim Bray
0516b80c07 Make the Certify screen a little more self-explanatory 2014-10-21 11:35:03 -07:00
Dominik Schürmann
0cdcc90984 More consisitency 2014-10-15 23:22:08 +02:00
Dominik Schürmann
4e1053c6fa More color/icon consistency 2014-10-15 23:05:29 +02:00
Dominik Schürmann
dc87557805 Group passphrase cache settings 2014-10-13 19:34:41 +02:00
Dominik Schürmann
e9abe57aa7 Remove key list filter for now 2014-10-13 15:53:39 +02:00
Dominik Schürmann
b86d235177 wording 2014-10-13 14:44:23 +02:00
Dominik Schürmann
5219cf5207 Better qr code icon 2014-10-13 14:38:25 +02:00
Jerzy Kołosowski
13ed3bbd8a Added option for num keypad for YubiKey 2014-10-13 04:47:48 +02:00
Vincent Breitmoser
815ed2e233 rewrite export with new operation style 2014-10-13 00:26:59 +02:00
Vincent Breitmoser
5453a3e5af DeleteResult: add custom createNotify 2014-10-11 19:55:19 +02:00
Vincent Breitmoser
e6a7960b8f move delete into operation class 2014-10-11 03:50:21 +02:00
Vincent Breitmoser
ee00894e27 different wording in share tab 2014-10-10 19:43:34 +02:00
Vincent Breitmoser
ebdcb53c68 fix width of displayed qr code 2014-10-10 19:42:30 +02:00
Vincent Breitmoser
21ea040910 add keys button goes to directly to qr scan 2014-10-10 19:05:33 +02:00
Vincent Breitmoser
2dcd070014 keylist: add safeslinger exchange button to secret keys 2014-10-10 19:05:30 +02:00
Dominik Schürmann
7646baf486 Better handling if no api key is selected 2014-10-09 01:51:35 +02:00
Vincent Breitmoser
f6d0347c79 rename certify_key_item to the more appropriate multi_certify_item 2014-10-08 22:47:30 +02:00
Dominik Schürmann
0d6d4653b4 Big error screen if signature is invalid or key is revoked/expired, also fixes signature status for expired and revoked keys 2014-10-08 18:31:31 +02:00
Dominik Schürmann
2eb776594f Handle revoked and expired keys in decrypt activity 2014-10-08 17:39:53 +02:00
Dominik Schürmann
158f22a799 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-08 17:32:41 +02:00
Dominik Schürmann
b573afe235 New decryption screen UI with modernPGP icons 2014-10-08 17:32:32 +02:00
Vincent Breitmoser
590650a303 remove ui hack, use padding instead of margin 2014-10-08 15:36:18 +02:00
Vincent Breitmoser
1b160f68c9 slightly change text in certify dialog 2014-10-08 15:15:25 +02:00
Dominik Schürmann
adcc07ca65 Filter key list by certified keys 2014-10-08 14:42:56 +02:00
Dominik Schürmann
27d062496f Fix MSG_MF_UID_PRIMARY log 2014-10-07 17:50:09 +02:00
Dominik Schürmann
355bcfbb66 Remove monospace from encrypt item 2014-10-07 17:37:05 +02:00
Dominik Schürmann
a150c0f480 Certify design 2014-10-07 17:24:20 +02:00
Dominik Schürmann
280899410f Certify design 2014-10-07 17:21:46 +02:00
Vincent Breitmoser
a50034bd10 forgot layout piece for 096f6e436 2014-10-06 19:25:29 +02:00
Vincent Breitmoser
f703d55bca move "synchronize" checkbox to bottom section as well 2014-10-06 15:42:47 +02:00
Vincent Breitmoser
b16a550fbb multicertify: move key spinner to the bottom 2014-10-06 15:41:15 +02:00
Vincent Breitmoser
12e44e7eeb Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-05 11:11:20 +02:00
Vincent Breitmoser
6699917279 add support for second line in log view 2014-10-05 11:10:40 +02:00
Dominik Schürmann
2768671206 UI stuff 2014-10-05 10:59:52 +02:00
Vincent Breitmoser
7fedde2638 add support for hierarchical log entries 2014-10-05 10:09:50 +02:00
Dominik Schürmann
0b9308753d use status icons in public key selection 2014-10-05 04:09:55 +02:00
Dominik Schürmann
d38b200b01 Add cloud icon 2014-10-05 03:39:44 +02:00
Vincent Breitmoser
48c843beae even more layout neatification 2014-10-05 02:15:43 +02:00
Vincent Breitmoser
60fb3b60a8 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java
2014-10-05 01:22:01 +02:00
Dominik Schürmann
d99115c263 preselect certify key 2014-10-05 01:23:34 +02:00
Vincent Breitmoser
dff68ac194 more layout neatification 2014-10-05 01:21:24 +02:00
Vincent Breitmoser
15165d056f slight layout changes to keyspinner_item 2014-10-05 01:07:32 +02:00
Dominik Schürmann
4fcd58b9f8 use new multi certify, layout fixes 2014-10-04 23:32:25 +02:00
Vincent Breitmoser
2b436b9a19 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 23:16:58 +02:00
Vincent Breitmoser
bad8aeea78 implement preliminary MultiCertifyActivity (most heavy lifting is done) 2014-10-04 23:16:51 +02:00
Dominik Schürmann
fbf993e621 add divider 2014-10-04 23:16:17 +02:00
Dominik Schürmann
0599f0dd4e Workings on new parcel for key downloads 2014-10-04 21:09:32 +02:00
Dominik Schürmann
9e1a0c2c0a Pass imported master key ids via result parcel 2014-10-04 18:59:59 +02:00
Vincent Breitmoser
0ffa1b94de certify: get rid of fingerprint check
Master key ids are unambiguous by database design, and only keys which
are in the database are signed. There is no reason to check the
fingerprint again during the certify operation.
2014-10-04 18:30:14 +02:00
Vincent Breitmoser
7e5918efa3 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 16:02:18 +02:00
Vincent Breitmoser
d004bf236b improve CertifyResult, add custom notify 2014-10-04 16:01:24 +02:00
Dominik Schürmann
7891560fc2 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 15:42:36 +02:00
Dominik Schürmann
a29d6b0ef3 Import code, fix collision of key spinner with other loaders 2014-10-04 15:42:23 +02:00
Vincent Breitmoser
0e0e3d8dd0 redesign certify action to work with parcel input and result 2014-10-04 15:19:43 +02:00
Dominik Schürmann
f0ee7ed4cf New add keys activity 2014-10-04 13:44:34 +02:00
Dominik Schürmann
f6e0d0f495 Make app_name translatable 2014-10-03 18:49:31 +02:00
Dominik Schürmann
13cd1daaaa Pull from transifex 2014-10-03 18:37:56 +02:00
Dominik Schürmann
0b572e9001 Changelog 2014-10-03 18:31:47 +02:00
Vincent Breitmoser
04c8d42436 get rid of two consolidate number preferences 2014-10-03 03:37:08 +02:00
Dominik Schürmann
8f616bcf0c Add null check when retrieving key ids from contacts api 2014-10-02 11:32:10 +02:00
Dominik Schürmann
42ce3bb0d3 Fix decrypt/verify from gmail/aosp mail with sharing intent, fix scrolling in decryt screen 2014-10-01 15:03:53 +02:00
Dominik Schürmann
f841203f5f Add filterTouchesWhenObscured to prevent Touch-Event Hijacking 2014-10-01 10:51:02 +02:00
Dominik Schürmann
e1a81ae5cd Update from transifex 2014-09-30 20:00:14 +02:00
Dominik Schürmann
cce2365173 Clarify api_create_account_text 2014-09-30 19:55:30 +02:00
Dominik Schürmann
8e5c5c9503 Remove unused layouts 2014-09-29 22:24:55 +02:00
Dominik Schürmann
51ea71d68a Maybe fixes encrypt files on tablets 2014-09-29 22:23:48 +02:00
Vincent Breitmoser
706e60474d be more mindful of algorithm and usage flag interaction
Fixes #895
2014-09-28 14:25:54 +02:00
Dominik Schürmann
1a7edc9925 Dont show keyboard by default in key creation to allow the user to get an overview what to type, use spannable where possible 2014-09-27 13:52:01 +02:00
Dominik Schürmann
d5a1e9bb66 3.0 beta1 2014-09-24 19:11:23 +02:00
Vincent Breitmoser
f48db5a005 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-24 15:41:16 +02:00
Dominik Schürmann
8b663add04 Pull from transifex 2014-09-24 15:41:00 +02:00
Vincent Breitmoser
312598290b fix save button when no file is selected 2014-09-24 15:36:34 +02:00
Vincent Breitmoser
a50fe142e4 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-24 15:31:37 +02:00
Vincent Breitmoser
7c6eff6d92 show message about saving multiple files rather than hide the button 2014-09-24 15:28:51 +02:00
Dominik Schürmann
e3a185f698 propose apps in apps list 2014-09-24 14:45:51 +02:00
Vincent Breitmoser
425cea41f2 add subtle attention seeker to decryptactivity with available clipboard data
Thanks Cyril Mottier

https://plus.google.com/+CyrilMottier/posts/FABaJhRMCuy
2014-09-24 02:43:45 +02:00
Dominik Schürmann
382ae968d6 Fix strings reported by yahoe.001 2014-09-24 02:36:24 +02:00
Dominik Schürmann
b373c866e7 Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate 2014-09-24 02:01:53 +02:00
Dominik Schürmann
6e0938aa93 Fix new decrypt button 2014-09-24 01:41:38 +02:00
Dominik Schürmann
993046d12e cleanup 2014-09-24 01:38:18 +02:00
Dominik Schürmann
42a7cd5eb0 Button text for decrypt 2014-09-24 01:37:00 +02:00
Dominik Schürmann
0143b54e9e Implement buttons in DecryptTextFragment 2014-09-23 23:38:30 +02:00
Dominik Schürmann
9f67b0fe54 DecryptTextActivity rework 2014-09-23 23:04:18 +02:00
Vincent Breitmoser
c5239d6e9b be more precise on importresult overall error 2014-09-23 16:23:13 +02:00
Vincent Breitmoser
da1779816b take failed keys into account in importkeyresult notification 2014-09-23 16:19:01 +02:00
Vincent Breitmoser
070017b12f passphrasecache: cache by master key, introduce preference for cache by subkey 2014-09-23 15:56:48 +02:00
Vincent Breitmoser
9d9d71f3db reject keys with duplicate subkeys altogether
closes #870
2014-09-23 01:36:46 +02:00
Vincent Breitmoser
862c9a8b3c log "unspecified" flags differently 2014-09-22 17:02:53 +02:00
Vincent Breitmoser
029ce91670 show authenticate flag in logs 2014-09-22 16:27:42 +02:00
Dominik Schürmann
d63fabace7 Hack to fix #805 2014-09-22 00:10:55 +02:00
Dominik Schürmann
db7da6525e Fix custom key configuration for primary user ids 2014-09-21 23:19:21 +02:00
Dominik Schürmann
65c3d69d9a Fix ConsolidateResult, needed parcelable methods 2014-09-21 22:31:28 +02:00
Dominik Schürmann
bf0104af2e Feature to change key configuration in create key 2014-09-21 21:50:56 +02:00
Dominik Schürmann
1f5f937d00 Small UI fixes 2014-09-21 18:10:51 +02:00
Dominik Schürmann
9bd3383b49 Merge user ids in import list for better display 2014-09-21 17:58:26 +02:00
Dominik Schürmann
b06fe773cf New key flags icons, subkey adapter redesign, support authanticate flag in database 2014-09-20 20:36:37 +02:00
Vincent Breitmoser
344bc1736d respect user id revocation signatures
Closes #836
2014-09-20 00:14:33 +02:00
Dominik Schürmann
1ad36e2dbd Beautify key id (thanks to Tim Bray) 2014-09-19 13:44:17 +02:00
Dominik Schürmann
99bf77dd84 Remove certificate validation code from ViewCertActivity, they are already validated by import 2014-09-19 11:46:21 +02:00
Dominik Schürmann
a454bfd701 Use key icons in import, prettify items 2014-09-18 22:05:27 +02:00
Dominik Schürmann
ac66f6cc10 Swipe-to-refresh fixes 2014-09-18 13:55:23 +02:00
Dominik Schürmann
9586d6b9b8 Use key icons in spinners 2014-09-17 23:06:49 +02:00
Dominik Schürmann
8724916866 Result parcel refactorings (WIP) 2014-09-17 15:08:02 +02:00
Dominik Schürmann
d686c55a0a Work on new result handling (WIP) 2014-09-17 13:45:16 +02:00
Vincent Breitmoser
e457d4c909 Merge remote-tracking branch 'origin/master'
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
	OpenKeychain/src/main/res/values-de/strings.xml
2014-09-15 14:00:17 +02:00
Vincent Breitmoser
9a3a032d99 move LogLevel info into LogType enum 2014-09-15 13:59:21 +02:00
Dominik Schürmann
40751bceb5 Pull from transifex 2014-09-15 10:44:36 +02:00
Dominik Schürmann
67e572cf4f Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-15 10:20:01 +02:00
Dominik Schürmann
53bc417f8f New decrypt activity design (WIP), saner UTF8 decoding (replacing non-decodable characters) 2014-09-15 10:19:55 +02:00
Tim Bray
c13ccda658 Keys found on multiple servers are now imported from all of them 2014-09-13 21:43:07 -07:00
Tim Bray
7de86a09bc Change shuffle to rotate, and when merging ImportKeysList entries, if either side is revoked/expired, the merge reflects that 2014-09-13 21:41:03 -07:00
Tim Bray
e14cf32264 Restore Yubikey setting, lost in fumble-fingered merge 2014-09-13 21:41:03 -07:00
Tim Bray
1c32d1df88 Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs 2014-09-13 21:41:03 -07:00
Vincent Breitmoser
36ef8a9a62 work on OperationResultParcel 2014-09-14 01:14:58 +02:00
Dominik Schürmann
88bbce831c Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-14 00:56:03 +02:00
Vincent Breitmoser
f0e159a372 add SignEncryptResult parcel (probably break stuff) 2014-09-14 00:33:30 +02:00
Dominik Schürmann
179f48a4de First work on decrypt 2014-09-14 00:11:23 +02:00
Dominik Schürmann
efdfd2544d Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-13 22:55:32 +02:00
Dominik Schürmann
c9fee47fb3 Custom actionbar to indicate swipe down effect 2014-09-13 22:55:27 +02:00
Vincent Breitmoser
85d0f5b6d5 add key id to trailing asym data log msg 2014-09-13 22:27:22 +02:00
Vincent Breitmoser
8a188a79dc log warning on bad uid encoding 2014-09-13 21:43:37 +02:00
Vincent Breitmoser
f8677a5f16 Merge branch 'result-parcels' 2014-09-13 21:32:17 +02:00
Vincent Breitmoser
7b08b18d25 some DecryptVerify log refinements 2014-09-13 21:29:29 +02:00
Vincent Breitmoser
efd9d1626e add a ton of logging to DecryptVerify 2014-09-13 21:14:06 +02:00
Dominik Schürmann
3bc3bc6d58 More smaller UI fixes 2014-09-13 21:01:47 +02:00
Daniel Albert
fd5e5afc9f Implemented Pull2Refresh in the KeyListFragment
Added KeyUpdateHelper and extended ProviderHelper for better fingerprint collection
Added a class for handling the list in the swipe2refresh layout that prevents scrolling bugs
Added Pull2Refresh to the KeyListFragment
2014-09-12 22:44:45 +02:00
Vincent Breitmoser
4e834d7833 add ui support for stripping subkeys 2014-09-11 22:50:44 +02:00
Dominik Schürmann
c40d105574 Changelog 2.9.2 2014-09-09 09:37:46 +02:00
Dominik Schürmann
1c06dd43cf Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-08 15:12:02 +02:00
Dominik Schürmann
0d40d5999b Fix changelog versioning 2014-09-08 15:11:54 +02:00
Vincent Breitmoser
ceea2667e8 introduce SingletonResult for... singleton results 2014-09-08 14:50:16 +02:00
Vincent Breitmoser
055fb59ec3 Properly handle uneditable key types in EditKeyFragment
More specifically, return an OperationResultParcel for stripped and
divert-to-card keys, with an appropriate error message in the log.

part of #828
2014-09-08 14:35:15 +02:00
Dominik Schürmann
980674b322 Pull from transifex 2014-09-08 14:26:10 +02:00
Dominik Schürmann
fcd4be5ba0 Changelog 2.10 2014-09-08 14:22:29 +02:00
Dominik Schürmann
afc20602eb Fix problems in strings.xml 2014-09-07 21:59:57 +02:00
Vincent Breitmoser
0b091aa642 flag revoked, epired and unavailable keys in selection spinner 2014-09-07 18:49:29 +02:00
Dominik Schürmann
c026dac8fc Remove table layout, use hint text for edit fields 2014-09-07 17:27:25 +02:00
Dominik Schürmann
94a47719ae Put quotes around all strings, should fix transifex consistency problems, also see http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to Escaping apostrophes and quotes) 2014-09-07 17:09:46 +02:00
Dominik Schürmann
3ba2e0b0c1 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-07 17:01:07 +02:00
Dominik Schürmann
d1e08f9305 Two buttons to encrypt files and text, some fixes 2014-09-07 17:00:58 +02:00
Vincent Breitmoser
fd7bdbf54f add proper async check for correct passphrase to passphrasedialog 2014-09-07 16:54:39 +02:00
Dominik Schürmann
02663de191 Better symmetric encryption layout 2014-09-07 16:14:48 +02:00
Dominik Schürmann
0e83df21cf More UI rework 2014-09-07 15:30:32 +02:00
Dominik Schürmann
0706005732 Fix width for encrypt to 2014-09-07 11:52:02 +02:00
Dominik Schürmann
0d1c9f7745 Remove file menu items from text activity 2014-09-06 18:06:48 +02:00
Dominik Schürmann
6e3973e26a Add experimental support for yubikey PINs, remove caching of empty passphrases 2014-09-05 20:04:07 +02:00
Dominik Schürmann
fa9bbdd60c Add yubikey default PIN preference 2014-09-05 19:40:04 +02:00
Dominik Schürmann
2a9b083012 Safeslinger: icon, about info 2014-09-04 21:12:25 +02:00
Dominik Schürmann
d0f46f1efb Integrate safeslinger share 2014-09-04 12:54:16 +02:00
Dominik Schürmann
65da538a15 Fix strings 2014-09-02 18:52:28 +02:00
Dominik Schürmann
fe2c17cdeb Pull from transifex 2014-09-02 14:11:10 +02:00
Dominik Schürmann
0c437acd43 Catch security exception, known problem... 2014-09-02 13:51:09 +02:00
Vincent Breitmoser
e0905a3afb cache key s2k type in database, for later use 2014-09-02 01:24:16 +02:00
Vincent Breitmoser
f8625f5310 rename EncryptMessageFragment -> EncryptTextFragment 2014-09-01 23:46:14 +02:00
Vincent Breitmoser
2ead78a1e5 split EncryptActivity into Encrypt{Text,File}Activity 2014-09-01 23:25:03 +02:00
Vincent Breitmoser
e26d7be7de remove "sign" and "verify" from drawer texts 2014-09-01 22:07:14 +02:00
Vincent Breitmoser
6b5e65253c small ui changes in encrypt 2014-09-01 21:43:15 +02:00
Vincent Breitmoser
6a3e7921cf remove "by holding..." explanation from button text 2014-09-01 21:24:24 +02:00
Dominik Schürmann
42acb12059 Fix transifex linebreaks by adding apostrophs to strings with linebreaks 2014-09-01 16:00:50 +02:00
Dominik Schürmann
40e6b24b14 Prepare API for OpenPgpSignatureResult extensions 2014-08-31 23:50:04 +02:00
Dominik Schürmann
9a18635b89 Changelog 2.9 2014-08-31 22:12:52 +02:00
Dominik Schürmann
9258fbfb74 Cleanup keyspinner layout, key id typeface monospace 2014-08-31 20:39:36 +02:00
Dominik Schürmann
bdf0436c94 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-31 20:26:12 +02:00
Dominik Schürmann
5e7eed239f Better leyout for account settings 2014-08-31 20:26:06 +02:00
Vincent Breitmoser
e46bc24079 add cancel support to edit key action 2014-08-31 19:20:08 +02:00
Vincent Breitmoser
d483a8b73e get rid of some last bootstrapbutton references 2014-08-31 19:01:28 +02:00
Dominik Schürmann
f6d1b45007 Move date picker to left because of width constraints inside the dialog 2014-08-31 18:51:29 +02:00
Vincent Breitmoser
06eb7148a2 Merge remote-tracking branch 'origin/master' 2014-08-31 17:37:45 +02:00
Vincent Breitmoser
7da7832284 Add cancelable mechanism and support in key import
Closes #323
2014-08-31 17:32:13 +02:00
Dominik Schürmann
5444c14ef9 Hide keyserver spinner under advanced options in certify activity 2014-08-31 17:26:29 +02:00
Vincent Breitmoser
a73abf57f1 if there is only one private key, use it fo certification by default 2014-08-31 00:19:59 +02:00
Vincent Breitmoser
0738a38bbe use LoaderFragment for CertifyActivity 2014-08-31 00:19:16 +02:00
Vincent Breitmoser
b6203a2b3c Merge remote-tracking branch 'dakid/master' 2014-08-30 17:03:47 +02:00
Vincent Breitmoser
5ff3043903 canonicalize: add check for algorithm type
closes #797
2014-08-30 17:00:58 +02:00
Daniel Albert
c7c2ccab45 Encrypted message is not being spellchecked anymore 2014-08-30 16:55:47 +02:00
Dominik Schürmann
b193965e58 Merge pull request #796 from open-keychain/develop
ECC support
2014-08-28 10:46:58 +02:00
Dominik Schürmann
9288e4f0a9 Fix RuntimeException in KeyListActivity on tablets 2014-08-28 10:37:01 +02:00
Dominik Schürmann
c2f6aa09c5 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-27 19:28:46 +02:00
Dominik Schürmann
d795f8d4e2 Strip out duplicate user ids 2014-08-27 19:28:33 +02:00
Vincent Breitmoser
cb2eb8aca2 small language fixes for previous commit 2014-08-27 15:42:09 +02:00
Dominik Schürmann
12a5b2174f Abort import of pubkeys where secret keys exist but new pubkey has more subkeys, fix #696 2014-08-27 14:12:59 +02:00
Dominik Schürmann
86a05033ae Cleanup FoldableLinearLayout 2014-08-27 13:54:33 +02:00
Vincent Breitmoser
783dae8804 add ecc support 2014-08-24 16:08:37 +02:00