moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-08-13 15:53:53 -04:00
Code Issues Releases Wiki Activity
1,292 Commits 12 Branches 24 Tags 116 MiB
ad1e047aa9
Commit Graph

634 Commits

Author SHA1 Message Date
Dominik Schürmann
1613a015d6 Merge pull request #322 from mj7007/smooth_activity_switch 
Smooth Activity Switch Fixed
 2014-03-04 10:59:59 +01:00
Dominik Schürmann
07bb421da5 Merge pull request #315 from jessicayuen/master 
#226: Added cancel option to ProgressDialogFragments. Create Key is now cancelable.
 2014-03-04 10:51:26 +01:00
mj7007
e4461b788f Smooth Activity Switch Fixed 2014-03-04 13:57:48 +05:30
Jessica Yuen
af6713dc78 #226: Small fix to prevent message from being sent if IntentService is canceled 2014-03-03 23:04:55 -05:00
Daniel Haß
d691d4c965 Added handling for other exceptions in the ImportListLoader. 2014-03-03 20:42:38 +01:00
Dominik Schürmann
b837579cdc Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-03 15:46:04 +01:00
Dominik Schürmann
94e161fe0d change ordering in Intent descriptions for better readability in small dialogs 2014-03-03 15:45:53 +01:00
Daniel Haß
ec8a3469ff Little fixes 2014-03-03 15:07:07 +01:00
Emantor
ed7485e91d Fix NewApi Lint Errors 
Fix missing ;

import android.annotation.TargetApi where needed
 2014-03-03 14:21:15 +01:00
Emantor
736eac074d Fix DefaultLocale Lint Warnings 2014-03-03 11:50:48 +01:00
Emantor
122e562675 Fix ScrollViewSize Lint Warnings 2014-03-03 11:48:45 +01:00
Daniel Haß
6362b2de94 Added FileHasNoContent string 2014-03-03 09:36:40 +01:00
Daniel Haß
f484122c35 Added exception for empty files 2014-03-03 09:36:10 +01:00
Daniel Haß
9843bafafd Added handler for FileHasNoContent exception, some clean up 2014-03-03 09:35:05 +01:00
Jessica Yuen
e4e3c555e9 #226: Async key gen task is stopped if progress is canceled 2014-03-02 20:55:13 -05:00
Jessica Yuen
91a2ecb15c #226: Activity no longer closes if progress is canceled for key creation in EditKeyActivity 2014-03-02 17:33:21 -05:00
Jessica Yuen
1baae3775e #226: Added cancel option to ProgressDialogFragments. Create Key is now cancelable. 2014-03-02 15:08:18 -05:00
Dominik Schürmann
64601fa981 version code 23101 for beta testing 2014-03-02 18:18:55 +01:00
Dominik Schürmann
6ddccb0d6f version code 23101 for beta testing 2014-03-02 18:15:11 +01:00
Dominik Schürmann
339136dda5 Update from transifex 2014-03-02 18:14:49 +01:00
Dominik Schürmann
4a13f70a88 API changes 2014-03-02 01:20:06 +01:00
Dominik Schürmann
0c60eea628 Merge pull request #306 from danielhass/keyserver-conerror 
Show error if keyserver is not reachable
 2014-02-28 23:27:57 +01:00
Daniel Haß
414839b915 Some clean up 2014-02-28 22:43:31 +01:00
Daniel Haß
7e229d4247 Added different notifys for different exceptions 2014-02-27 22:15:50 +01:00
Daniel Haß
c60ec7a8a7 Added error strings for key import from keyserver 2014-02-27 22:10:07 +01:00
Dominik Schürmann
7bbfd9d446 cleanup 2014-02-27 16:55:42 +01:00
Dominik Schürmann
5c78c11756 remove dublication of api library, let both proejcts depend on the same 2014-02-27 16:40:59 +01:00
Nikhil Peter Raj
87af739773 Added GPL headers 2014-02-27 18:09:47 +05:30
Daniel Haß
2fa9067edb Added StackOverflow link to documentation 2014-02-27 10:20:24 +01:00
Daniel Haß
49769645a0 Added documentation to the AsyncTaskResultWrapper 2014-02-27 10:17:38 +01:00
Nikhil Peter Raj
c98a7d1977 Complete fix for #304 2014-02-27 00:56:33 +05:30
Daniel Haß
20470748a9 Adapted the ImportKeysLoader to work with the new AsyncWrapper 2014-02-26 19:16:28 +01:00
Daniel Haß
5d1f61bff7 Reworked ImportKeysListFragment to handel exceptions, ImportKeyListLoader is temporarily disabled 2014-02-26 18:00:13 +01:00
Daniel Haß
9bbb286c5e Added the AsyncTaskResultWrapper 2014-02-26 17:58:12 +01:00
Nikhil Peter Raj
5ddf001f9c Partial fix for #304 2014-02-26 11:33:39 +05:30
Nikhil Peter Raj
fa6ea57121 Final fix for #266 
-Fix implemented using setIcon() as setIconAttribute() is not valid for
API less than 11
 2014-02-26 00:29:01 +05:30
Nikhil Peter Raj
c77aff6fc2 Removed Thumbs.db,added to gitignore 2014-02-25 23:43:59 +05:30
Nikhil Peter Raj
fc06f678c5 Fix for #266 
-Extra: Added the appropriate images to drawable folder from Android SDK
source, can be used as alternative if required.
 2014-02-25 22:45:29 +05:30
Daniel Haß
1351c6f804 Replaced Toast with AppMsg in DecryptActivity 2014-02-24 22:02:32 +01:00
Dominik Schürmann
0747a5815f cleanup 2014-02-24 01:32:00 +01:00
Dominik Schürmann
c7c45a80fa fix signature passing and verify in demo 2014-02-24 01:24:46 +01:00
Daniel Haß
947b9902e5 remove debug stuff 2014-02-23 23:59:55 +01:00
Daniel Haß
09e220eddd Revert "Replaced Toast with AppMsg in EncryptActivity" 
This reverts commit e936a4762b.
 2014-02-23 23:56:10 +01:00
Daniel Haß
e936a4762b Replaced Toast with AppMsg in EncryptActivity 2014-02-23 23:50:55 +01:00
Daniel Haß
1f36238a1b Replaced Toast with AppMsg in EncryptActivity 2014-02-23 23:35:11 +01:00
Dominik Schürmann
f7216841e3 Update help_start.html 2014-02-23 17:29:11 +01:00
Dominik Schürmann
e12598028f AndroidManfiest code for later... 2014-02-21 16:28:48 +01:00
Dominik Schürmann
5b0c82b58f import key from email app directly 2014-02-21 16:21:06 +01:00
Dominik Schürmann
c2013c9ca8 precompile user id pattern 2014-02-21 15:47:15 +01:00
Dominik Schürmann
f29d3015b8 rename 2014-02-21 15:45:10 +01:00
Dominik Schürmann
fb0816c126 internal renaming, cleanup 2014-02-21 02:40:44 +01:00
Dominik Schürmann
aaddd26b51 verification of cleartext signatures works 2014-02-21 02:31:30 +01:00
Dominik Schürmann
b4f977673f rename to OpenKeychain 2014-02-21 01:03:20 +01:00
Dominik Schürmann
a02d07b57c Merge pull request #282 from danielhass/master 
Replaced Toasts with AppMsg library
 2014-02-20 23:17:57 +01:00
Daniel Haß
f41a505f7e Added AppMsg library 2014-02-20 22:50:37 +01:00
Daniel Haß
836ef8b7ab Updated library section (AppMsg library) 2014-02-20 21:07:59 +01:00
Dominik Schürmann
77c635ea12 rename in README 2014-02-20 20:13:36 +01:00
Daniel Haß
f6c9fd9707 Deleted Toast import 2014-02-20 17:51:33 +01:00
Daniel Haß
b9ad95b93d Replaced Toasts with AppMsg-Library notifys 2014-02-20 17:50:53 +01:00
Daniel Haß
b0c3073790 Added AppMsg compile option to gradle 2014-02-20 17:49:20 +01:00
Dominik Schürmann
e75fd5a156 cleanup 2014-02-19 13:12:08 +01:00
Dominik Schürmann
7436bf578c cleanup 2014-02-19 13:06:57 +01:00
Dominik Schürmann
b952af90e6 Builder pattern for PgpOperationIncoming 2014-02-19 13:04:29 +01:00
Dominik Schürmann
e9082c0db5 Update from transifex 2014-02-19 12:44:35 +01:00
Dominik Schürmann
b074293168 certifications text 2014-02-19 12:43:56 +01:00
Dominik Schürmann
c5688889a7 fixes encryption 2014-02-19 12:07:07 +01:00
Dominik Schürmann
a5e33097a6 cleanup 2014-02-19 10:47:13 +01:00
Dominik Schürmann
1710f4416f Use builder pattern for sign and encrypt 2014-02-19 00:18:52 +01:00
Dominik Schürmann
d23950f799 add integrity check 2014-02-18 22:59:00 +01:00
Dominik Schürmann
9b4245739e merge internal signText and signAndEncrypt methods 2014-02-18 22:47:26 +01:00
Dominik Schürmann
708d0c9a5a better error check 2014-02-18 13:19:41 +01:00
Dominik Schürmann
0597b50258 documentation 2014-02-17 20:41:54 +01:00
Dominik Schürmann
439c7a66f2 fix margins 2014-02-17 20:18:17 +01:00
Dominik Schürmann
7a04dfe6bf prevent key view from scrolling, move encrypt button down again 2014-02-17 20:16:58 +01:00
Dominik Schürmann
d5824e6740 cleanup 2014-02-17 19:50:07 +01:00
Dominik Schürmann
f3bbd34482 Fix register activity 2014-02-17 19:06:29 +01:00
Dominik Schürmann
37f280afbb check if caller is allowed 2014-02-17 18:37:01 +01:00
Dominik Schürmann
154849b591 rename intent helper 2014-02-16 01:35:14 +01:00
Dominik Schürmann
ec2ca61b65 fix some intents and demos 2014-02-16 00:40:10 +01:00
Dominik Schürmann
81b810e9f6 intent demo, fix some intents 2014-02-15 20:14:23 +01:00
Dominik Schürmann
b97a099598 warn that key generation takes looong 2014-02-15 17:09:55 +01:00
Dominik Schürmann
2b98f2a0d7 Restructure API lib folder to support Eclipse 2014-02-15 17:09:21 +01:00
Dominik Schürmann
a76169c39e fix regression bug with finish not called on activity but on fragment causing params to be not passed through 2014-02-15 16:08:43 +01:00
Dominik Schürmann
52f1c930eb parse string util method, better help text for access screen 2014-02-15 13:00:47 +01:00
Dominik Schürmann
3b0f76bf60 allow passphrase as parameter 2014-02-15 02:44:03 +01:00
Dominik Schürmann
e0111c2ec4 code simplifications 2014-02-15 02:30:31 +01:00
Dominik Schürmann
5f39cb3ec0 fix passtrough of params 2014-02-15 02:08:27 +01:00
Dominik Schürmann
494a5fa414 private request codes, pass params through methods and pending intents, getKeyIds method 2014-02-15 01:06:03 +01:00
Dominik Schürmann
581e6edb4c cleanup 2014-02-14 17:19:54 +01:00
Dominik Schürmann
d695374581 conversion of other methods 2014-02-14 17:01:17 +01:00
Dominik Schürmann
acad2ba957 PendingIntent to handle user input 2014-02-14 13:40:24 +01:00
Dominik Schürmann
ee2fec1759 fix nullpointer 2014-02-14 02:41:27 +01:00
Dominik Schürmann
7939aaaa44 Introducing new ParcelFileDescriptor pipes 2014-02-14 02:33:21 +01:00
Dominik Schürmann
7b819e65de Transifex update 2014-02-13 23:37:48 +01:00
Dominik Schürmann
519209da63 Layout fixes for registered apps 2014-02-13 23:34:57 +01:00
Dominik Schürmann
7ba0d1012c Pull from transifex 2014-02-09 21:51:40 +01:00
Dominik Schürmann
c744cad8db Allow import of full keys from qr codes 2014-02-09 21:37:01 +01:00
Dominik Schürmann
0c4b809195 rework key view into fragments to later add certifications 2014-02-09 21:17:30 +01:00
Dominik Schürmann
754b2a6cb1 Restructuring for new API library 2014-02-09 19:22:14 +01:00
Dominik Schürmann
35a123f53c Update from transifex 2014-02-08 15:44:18 +01:00
Dominik Schürmann
76806ebd57 language fixes 2014-02-08 15:42:31 +01:00
Dominik Schürmann
616c903a2a do not delete pub keys where secret key exists 2014-02-06 01:02:18 +01:00
Dominik Schürmann
a41228fc06 changelog 2014-02-05 19:58:30 +01:00
Dominik Schürmann
cf499462c5 Hotfix for database upgrade, version 2.3.1 2014-02-05 19:55:32 +01:00
Dominik Schürmann
b1530c4758 Fix wording 2014-02-05 15:37:56 +01:00
Dominik Schürmann
e146deccc0 Version 2.3 2014-02-05 13:18:45 +01:00
Dominik Schürmann
09ae50cc56 keyserver instead of key server 2014-02-05 13:09:59 +01:00
Dominik Schürmann
25080f45b1 fix certify key resource 2014-02-05 13:00:00 +01:00
Dominik Schürmann
d72b0e157a Update from transifex 2014-02-05 12:56:40 +01:00
Dominik Schürmann
b203723b20 fix small language confusion 2014-02-05 12:52:25 +01:00
Dominik Schürmann
e37190a76d drawer icons have not the same width, fix this 2014-02-05 00:26:06 +01:00
Dominik Schürmann
6498c3443b Update from transifex 2014-02-05 00:22:26 +01:00
Dominik Schürmann
1f1de0ce06 better alignment of navigation drawer icons 2014-02-05 00:19:32 +01:00
Dominik Schürmann
c1e6b5284d again improving help text 2014-02-04 23:06:19 +01:00
Dominik Schürmann
9667245613 small layout problem fixed 2014-02-04 22:53:53 +01:00
Dominik Schürmann
9d074b01e9 fix display of fingerprint in key server query 2014-02-04 22:28:08 +01:00
Dominik Schürmann
ecd376961f Fix double loading of navigation fragments 2014-02-04 21:46:22 +01:00
Dominik Schürmann
e2bd3ae831 reworking some parts of import activity code 2014-02-04 20:18:14 +01:00
Dominik Schürmann
a56219a027 reformat 2014-02-04 19:55:40 +01:00
Dominik Schürmann
d090d4d332 work on lookup key, fix some illegal state exceptions with hack 2014-02-04 19:53:50 +01:00
Dominik Schürmann
b78a564de3 temporary fix for nullpointer on orientation change in import activity 2014-02-04 18:59:40 +01:00
Dominik Schürmann
82b0fba47d better help text 2014-02-04 18:36:43 +01:00
Dominik Schürmann
e6b64f5f3b better help text 2014-02-04 18:36:10 +01:00
Dominik Schürmann
34ec841a0b More layout fixes 2014-02-04 18:16:21 +01:00
Dominik Schürmann
99ec57aeaa nicer list items 2014-02-04 17:52:17 +01:00
Dominik Schürmann
c434c426e7 Show revoked status in key list 2014-02-04 15:01:50 +01:00
Dominik Schürmann
d75ea3f9e5 Certify not sign a key, added as button, does not belong to menu 2014-02-04 14:20:49 +01:00
Dominik Schürmann
ba08970850 expose key server API 2014-02-02 22:15:48 +01:00
Dominik Schürmann
3f7870243b Update version code for beta 2014-02-02 19:39:03 +01:00
Dominik Schürmann
c5d0f9f981 changelog 2014-02-02 19:28:13 +01:00
Ashley Hughes
e426f4d6a6 change when passphrase is requested in edit activity 2014-02-02 17:18:25 +00:00
Dominik Schürmann
a14c5de22e Use buttons for encrypt decrypt instead of actionbar 2014-02-02 17:34:43 +01:00
Dominik Schürmann
91f083796c Update libs in README 2014-02-02 16:48:46 +01:00
Dominik Schürmann
75faa60be1 Hacks to make dialogs on Android 2.3 black on white, and not black on black 2014-02-02 16:24:58 +01:00
Dominik Schürmann
172b57bb97 Update libs in about 2014-02-02 14:42:29 +01:00
Dominik Schürmann
ef1401fc0d Resolve crashes on Android 2.3 due to ActionBarCompat conversion 2014-02-02 14:30:40 +01:00
Dominik Schürmann
6eaf45940e Switch from ActionBarSherlock to ActionBarCompat 2014-02-02 14:13:09 +01:00
Ashley Hughes
f916c8f5af update hasPassphrase for subkey only keyrings 2014-02-02 10:24:03 +00:00
Ashley Hughes
0b8036fbef allow passphrases to be removed 2014-02-02 00:51:56 +00:00
Ashley Hughes
5e4b98f748 Merge branch 'edit-fixes' 2014-02-02 00:15:23 +00:00
Ashley Hughes
0787694160 fix select key-signing keys 2014-02-02 00:14:23 +00:00
Dominik Schürmann
8b11d1f74a importing progress dialog language fixed 2014-02-01 23:14:31 +01:00
Dominik Schürmann
d385f9cce0 importing progress dialog language fixed 2014-02-01 23:04:35 +01:00
Dominik Schürmann
b49bf09e90 Cleanup 2014-02-01 22:59:52 +01:00
Dominik Schürmann
716f417948 Update NFC help 2014-02-01 22:55:27 +01:00
Dominik Schürmann
1b0b761352 Fix scanning of fingerprint qr code, whole qr code scanning still broken 2014-02-01 22:51:07 +01:00
Dominik Schürmann
20af0d3b2e Fix QR Code URI 2014-02-01 22:06:57 +01:00
Dominik Schürmann
4e32459824 Update from transifex 2014-02-01 22:01:24 +01:00
Dominik Schürmann
776392be3a Reworking import, testing needed... 2014-02-01 21:55:34 +01:00
Dominik Schürmann
17f63e0716 Fix loader init 2014-02-01 20:11:17 +01:00
Dominik Schürmann
750aaead8e Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-02-01 19:50:01 +01:00
Dominik Schürmann
0e53d901e6 search works 2014-02-01 19:49:44 +01:00
Ashley Hughes
c07be572c2 fix disable editing for subkey keys 2014-02-01 18:32:06 +00:00
Dominik Schürmann
7e634a9930 Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-02-01 18:53:19 +01:00
Ashley Hughes
1e565ef872 Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain 2014-02-01 17:29:23 +00:00
Dominik Schürmann
a891ff2f7c rename KeyServerUploadActivity to UploadKeyActivity 2014-02-01 18:16:25 +01:00
Dominik Schürmann
abbdfd48df Started working on integration of keyserver query into import activity 2014-02-01 18:13:26 +01:00
Ashley Hughes
af5e01db8e create new keys without lots of extra certification 2014-02-01 17:01:03 +00:00
Ashley Hughes
3f0f3cca6a wrong types being created 2014-02-01 16:36:33 +00:00
Dominik Schürmann
b87f0b2658 save fingerprint on save 2014-02-01 16:35:53 +01:00
Dominik Schürmann
c4340b2379 No bouncy castle objects in key view 2014-02-01 16:34:42 +01:00
Dominik Schürmann
5359205b50 Fix layout, add API notes to README, register fingerprint URIs, some reformatting (sry) 2014-02-01 16:17:33 +01:00
Dominik Schürmann
35f4c470d3 Fix display of long user ids in key view 2014-01-31 18:32:58 +01:00
Dominik Schürmann
34d791c9bd Allow state loss on dismissal of progress dialogs, fixes #217 2014-01-31 18:16:06 +01:00
Dominik Schürmann
d8a91f15df Fix and simplify user id parsing 2014-01-31 17:55:24 +01:00
Ashley Hughes
de6a515ca5 create keys with minimal keyrings being constructed in between 2014-01-31 15:19:59 +00:00
Dominik Schürmann
a0c851299a update from transifex 2014-01-31 13:23:57 +01:00
Ashley Hughes
f7afa0c820 default keys gen 2014-01-31 11:49:08 +00:00
Ashley Hughes
617f117e23 generate single key 2014-01-31 11:44:10 +00:00
Ashley Hughes
fa0bd5edb4 builds, but intents are not called or handled correctly 2014-01-30 15:50:24 +00:00
Ashley Hughes
9f38c1436c save work 2014-01-30 15:43:08 +00:00
Ashley Hughes
4119757699 bouncycastle uses the Date class, based off of UTC. Force all GregorianCalendars to use UTC, so get and set of key dates works as expected 2014-01-30 11:35:55 +00:00
Ashley Hughes
358ab7d7e4 binding signatures have the same creation time 2014-01-30 09:50:56 +00:00
Ashley Hughes
800452b5c1 change key expiry 2014-01-30 00:33:20 +00:00
Dominik Schürmann
c4265c5e91 add some changelog items 2014-01-29 10:55:55 +01:00
Dominik Schürmann
1b1724f7af language fix 2014-01-29 10:46:59 +01:00
Dominik Schürmann
08d301a308 Fix transifex config and pull translations 2014-01-29 04:06:53 +01:00
Dominik Schürmann
bf59d2a69b small language changes 2014-01-29 04:03:15 +01:00
Dominik Schürmann
7b38bfcbf4 show unknown in ViewKey if user id is not set 2014-01-29 03:58:36 +01:00
Dominik Schürmann
c70195e4e3 Give expiry dates to PgpKeyOperation 2014-01-29 03:51:36 +01:00
Dominik Schürmann
ecf6fc26c5 Use intent data instead of IDs for upload and sign, fixes #205 2014-01-29 03:24:42 +01:00
Dominik Schürmann
f276455624 save keyring in-place, fixes #228, #203 2014-01-29 03:06:26 +01:00
Dominik Schürmann
ca9696ff34 Update gradle build files to use android plugin 0.8.0, build tools 19.0.1 2014-01-29 01:49:59 +01:00
Dominik Schürmann
312b7fde53 small code restructures 2014-01-29 01:38:34 +01:00
Ashley Hughes
2d4b2ae0df show import secret key userID 2014-01-28 23:55:27 +00:00
Ashley Hughes
e6d4b0c70b exporting secret keys means exporting public, no need to do so twice 2014-01-28 23:03:52 +00:00
Dominik Schürmann
0d1cd047c9 Fix logging in ClipboardReflection 2014-01-28 10:31:36 +01:00
Ashley Hughes
4071ce8550 re-enable getEmbeddedSignatures 2014-01-27 23:31:19 +00:00
Dominik Schürmann
cb3ca37db9 New Gradle project structure 2014-01-27 14:18:25 +01:00
Dominik Schürmann
08e57019b0 Remove old spongy castle libs 2014-01-27 14:01:47 +01:00
Dominik Schürmann
6ae99cc6cb New build files for spongy castle 2014-01-27 14:01:37 +01:00
Dominik Schürmann
8ca42b9bf9 Disable getEmbeddedSignatures() until patch by Ashh87 has been applied again in our spongy castle fork 2014-01-27 13:34:28 +01:00
Dominik Schürmann
7183c4ab06 fix crash on keys with empty user id 2014-01-25 20:00:01 +01:00
Dominik Schürmann
b2e8cc6757 remove navigation drawer from help 2014-01-25 19:30:33 +01:00
Dominik Schürmann
21deff0b7c smaller expiry buttons 2014-01-25 19:29:12 +01:00
Dominik Schürmann
18d1dc4525 remove shadow from icon 2014-01-25 19:23:25 +01:00
Dominik Schürmann
206ba4e551 Merge branch 'master' of github.com:dschuermann/openpgp-keychain 2014-01-24 16:05:42 +01:00
Dominik Schürmann
647b802b59 Fix language problems (thanks to yahoe.001) 2014-01-24 16:05:34 +01:00
M. Dietrich
64addd58d4 add "never" for ttl for passphrase cache 2014-01-23 14:22:15 +01:00
Dominik Schürmann
289032fa72 update from transifex for russian translation 2014-01-21 10:56:52 +01:00