cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,925 Commits 1 Branch 0 Tags
827d122ab07938177b10cd1cff32d48fb2875d55
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann 827d122ab0 translation fixes 2015-03-23 22:38:20 +01:00
Dominik Schürmann 6b164ad8bf Fix language problems reported by yahoe.001 on transifex 2015-03-23 22:18:29 +01:00
Dominik Schürmann 2204195234 Update build env and plugins 2015-03-23 20:17:30 +01:00
Dominik Schürmann e2f27d0f47 Pull from transifex 2015-03-23 15:54:48 +01:00
Dominik Schürmann 4405e5fbdd Remove remaining html entities in changelog 2015-03-23 15:48:51 +01:00
Dominik Schürmann 4fb88d0049 Fix transifex config 2015-03-23 15:48:02 +01:00
Dominik Schürmann 95639f2720 Merge pull request #1165 from kentnek/dev-yubikey-null 
Fixed #1152: NullPointerException when signing with YubiKey
 2015-03-23 15:39:16 +01:00
Dominik Schürmann 54cd414693 Merge pull request #1166 from adithyaphilip/multi-threaded 
Multi-threaded key import, update all feature
 2015-03-23 15:38:57 +01:00
Dominik Schürmann aa3565b857 Fix passphrase cache not clearing all passphrases 2015-03-23 15:38:02 +01:00
Dominik Schürmann 30711c3fe7 Merge pull request #1174 from Jesperbk/development 
Fixed symmetric encryption crash
 2015-03-23 13:01:10 +01:00
Dominik Schürmann 208434087f Update readme for libs link 2015-03-23 01:31:11 +01:00
Dominik Schürmann 78e7e986af Markdown comments 2015-03-23 01:23:42 +01:00
Dominik Schürmann c3cd96d79f Remove changelog in main folder, update comments 2015-03-23 01:21:26 +01:00
Dominik Schürmann fe340c82ba Update transifex config 2015-03-23 01:18:56 +01:00
Dominik Schürmann 633b64fd95 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-23 01:11:17 +01:00
Dominik Schürmann b3a599f214 Use markdown for in-app help 2015-03-23 01:11:11 +01:00
Dominik Schürmann 4af9b3c7e8 Merge pull request #1170 from manojkhannakm/development 
Updated openpgp-api-lib
 2015-03-22 21:09:37 +01:00
Dominik Schürmann c7efaacc9d Merge branch 'manojkhannakm-development' into development 2015-03-21 15:43:51 +01:00
Dominik Schürmann bf427ce9c1 Merge branch 'development' of https://github.com/manojkhannakm/open-keychain into manojkhannakm-development 2015-03-21 15:43:44 +01:00
Dominik Schürmann 10f9dcd7a1 Add TODO to remote API 2015-03-21 15:43:36 +01:00
Dominik Schürmann acd6c2ecec Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-20 15:15:54 +01:00
Dominik Schürmann 2153aea197 Update api lib 2015-03-20 15:15:47 +01:00
Dominik Schürmann 0954b02812 Merge pull request #1163 from kentnek/dev-list-footer 
Added a blank footer view to the list of keys
 2015-03-20 15:01:08 +01:00
Dominik Schürmann 75cd80fd37 Update OpenPGP API lib 2015-03-20 14:35:16 +01:00
Dominik Schürmann ebf9bb3a63 Fix API RESULT_TYPE 2015-03-20 13:51:06 +01:00
Dominik Schürmann 9e668eadcb Fix PASSPHRASE handling in API 2015-03-20 13:38:07 +01:00
Dominik Schürmann 10510288f1 Merge pull request #1164 from kentnek/dev-nfc-advanced-view 
Implemented #1071: Invoke NFC in Advanced View
 2015-03-20 10:16:14 +01:00
Dominik Schürmann cfef53be01 Remove on click on icon 2015-03-19 17:21:26 +01:00
Dominik Schürmann 7e5cc9ee70 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-19 17:16:30 +01:00
Dominik Schürmann 98817d13ee Manage my keys wizard 2015-03-19 17:16:23 +01:00
Dominik Schürmann 9a612131fd Merge pull request #1158 from manojkhannakm/development 
Fixed a crash on ViewKeyActivity and Issue #1114
 2015-03-19 16:36:37 +01:00
Dominik Schürmann 0bcc2793c3 Improve Passphrase class with finalize() 2015-03-19 13:58:26 +01:00
Dominik Schürmann 834ce03f9e Fix header 2015-03-19 03:30:49 +01:00
Dominik Schürmann e65efce333 Fix tests for Passphrase class 2015-03-19 03:30:12 +01:00
Dominik Schürmann b24ff10c43 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-19 03:04:08 +01:00
Dominik Schürmann 9c9f95c7ac New Passphrase class for safer passphrase handling in memory 2015-03-19 03:03:46 +01:00
Dominik Schürmann d25cc08be4 Merge pull request #1160 from jellysheep/cloudsearch-show-main-email 
Show HKP server results first in key cloud search. Fixes #1066
 2015-03-18 22:58:39 +01:00
Dominik Schürmann 53d7c1f533 Merge pull request #1155 from adithyaphilip/development 
Removed JellyBean restriction on Contact Sync
 2015-03-17 14:56:31 +01:00
Dominik Schürmann dbcb7a9e10 Manifest cleanup 2015-03-17 13:29:54 +01:00
Dominik Schürmann 7f2a89e125 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-17 13:22:21 +01:00
Dominik Schürmann 444123d040 File extensions into Constants 2015-03-17 13:22:13 +01:00
Dominik Schürmann 1f8c6c2456 Merge pull request #1154 from adithyaphilip/development 
Removed unnecessary @TargetApi annotation in ContactHelper
 2015-03-16 22:52:30 +01:00
Dominik Schürmann 025eaf0757 Disable hidden recipients for now 2015-03-16 20:34:27 +01:00
Dominik Schürmann fd8f5ebb2f Allow for hidden recipients in encrypt methods 2015-03-16 18:20:44 +01:00
Dominik Schürmann a5271bf229 Allow encrypt of filenames via overflow menu 2015-03-16 17:00:53 +01:00
Dominik Schürmann 916ff0e0fa Remove old info from readme 2015-03-16 16:33:37 +01:00
Dominik Schürmann 5d7c1e6fb0 Remove old info from readme 2015-03-16 16:32:13 +01:00
Dominik Schürmann 146fa8d6c0 Clarify certification help screen 2015-03-16 15:05:39 +01:00
Dominik Schürmann 98b942982e Update api lib 2015-03-16 14:27:26 +01:00
Dominik Schürmann ae0b85a2e0 Update api lib 2015-03-16 14:06:55 +01:00
Dominik Schürmann 484c3092ee object oriented split user id 2015-03-16 13:54:12 +01:00
Dominik Schürmann a655664c0b object oriented split user id 2015-03-16 13:54:01 +01:00
Dominik Schürmann 0e71fcd638 Update openpgp-api lib 2015-03-16 13:03:17 +01:00
Dominik Schürmann 58450daef4 Fix nullpointer when scanning malformed qr codes 2015-03-16 00:16:20 +01:00
Dominik Schürmann ad9c35f522 Allow selection of none in SelectSignKeyIdActivity 2015-03-15 22:05:12 +01:00
Dominik Schürmann 5cb22ece30 Clarify MIME usage 2015-03-15 21:17:24 +01:00
Dominik Schürmann d824ec3bc9 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-15 19:35:12 +01:00
Dominik Schürmann 75368034bd Put API activites in normal process to allow hydrate/dehydrate of logs 2015-03-15 19:35:03 +01:00
Dominik Schürmann 809cd6e495 Prefer ZIP algorithm as discussed on OpenPGP WG mailinglist 2015-03-15 18:58:09 +01:00
Dominik Schürmann 3da60c9ea3 Add ignore dirty to other git submodules 2015-03-15 18:47:56 +01:00
Dominik Schürmann fd5719ff6b Remove display of key id in other lists 2015-03-15 18:40:52 +01:00
Dominik Schürmann 81d6da899f Show main user id instead of key in certify screen 2015-03-15 16:32:52 +01:00
Dominik Schürmann e873bac880 Fixes for selection of certify key 2015-03-15 16:24:06 +01:00
Dominik Schürmann ff60e80d42 Merge pull request #1142 from tdjogi010/development 
Preselected Suitable Key
 2015-03-15 15:56:12 +01:00
Dominik Schürmann 8a2bd80d40 Merge pull request #1148 from manojkhannakm/development 
Fixed a ClassCastException
 2015-03-15 15:35:32 +01:00
Dominik Schürmann f1dc58ddfd Merge pull request #1147 from Hiperzone/development 
-fixed out of bounds crash when retrieving the main profile name with se...
 2015-03-15 15:34:07 +01:00
Dominik Schürmann f4cb254404 Dont display key ids in KeySpinner, display creation date when user ids duplicate 2015-03-15 15:29:06 +01:00
Dominik Schürmann 0b654bdfe5 Use fixed version of com.squareup:fest-android, enable offline builds 2015-03-15 14:57:37 +01:00
Dominik Schürmann c2593f29ff Query for duplicate user ids 2015-03-15 02:40:31 +01:00
Dominik Schürmann 6c9b2ce0c0 Add missing license headers 2015-03-15 00:49:29 +01:00
Dominik Schürmann 8ede97b9ff Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-14 21:36:35 +01:00
Dominik Schürmann f1b1ecae20 Merge pull request #1143 from manojkhannakm/development 
Fix for Issue #1115
 2015-03-14 21:36:28 +01:00
Dominik Schürmann afa7790fbd disable debug sync 2015-03-14 14:08:03 +01:00
Dominik Schürmann 12734127a7 Use names also for main contact 2015-03-14 14:07:45 +01:00
Dominik Schürmann cd7f631221 Show key name instead of key id in contacts, cleanup 2015-03-14 14:05:31 +01:00
Dominik Schürmann 23290b9013 Merge pull request #1144 from adithyaphilip/main-profile-keys 
Own keys linked to "me" contact
 2015-03-14 13:40:53 +01:00
Dominik Schürmann b953623802 Clarify logs in DeleteFileDialog 2015-03-12 14:34:58 +01:00
Dominik Schürmann 27027b8ee5 Use notify instead of Toast for NFC check 2015-03-12 13:39:20 +01:00
Dominik Schürmann 67a9f12790 Merge pull request #1133 from Rrego6/development 
Check if NFC is available on device
 2015-03-12 13:38:15 +01:00
Dominik Schürmann 183457334f Merge pull request #1117 from danielnelz/development 
#1042: Replaced ints with enums
 2015-03-12 13:27:04 +01:00
Dominik Schürmann dae48e84c8 Improve file deletion strings 2015-03-12 13:18:31 +01:00
Dominik Schürmann 4de978bccb Merge pull request #1137 from manojkhannakm/development 
Updated fix for Issue #1116
 2015-03-12 13:11:29 +01:00
Dominik Schürmann fb1701f09f Merge pull request #1134 from adithyaphilip/sync-confirmed-keys 
Sync only confirmed keys and change
 2015-03-12 13:08:18 +01:00
Dominik Schürmann 82a2a76a33 make constant for certify hash algo 2015-03-11 14:37:23 +01:00
Dominik Schürmann 4ed1bf0ca4 Version 3.2beta2 2015-03-10 16:30:00 +01:00
Dominik Schürmann 58d066a54e Pull from transifex 2015-03-10 16:19:46 +01:00
Dominik Schürmann 446e16fc62 Disable maybe methods in ImportKeysListEntry for now 2015-03-10 15:55:19 +01:00
Dominik Schürmann 79a4e7fb9c Fix expiry, revoked checks in OpenPgpSignatureResultBuilder 2015-03-10 15:52:44 +01:00
Dominik Schürmann 0e32b37f9d Changelog 3.2beta1 2015-03-10 15:35:47 +01:00
Dominik Schürmann 7346144ba9 Remove unused NFC Beam html 2015-03-10 15:18:24 +01:00
Dominik Schürmann 686146a871 Update openpgp lib 2015-03-10 15:17:27 +01:00
Dominik Schürmann 8f44500fdf Update api lib 2015-03-10 11:35:12 +01:00
Dominik Schürmann f13953e8fc API 7 2015-03-10 11:34:35 +01:00
Dominik Schürmann b3257e0ffa Ripple 2015-03-10 02:13:36 +01:00
Dominik Schürmann ae1c80e8b3 Merge branch 'adithyaphilip-contact-card' into development 2015-03-10 01:52:14 +01:00
Dominik Schürmann 64e85a2eb4 Merge branch 'contact-card' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-contact-card 
Conflicts:
	Graphics/get-material-icons.sh
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java
	OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml
 2015-03-10 01:51:30 +01:00
Dominik Schürmann b74fa6c662 Merge pull request #1121 from adithyaphilip/rawcontact-deletion 
Fixed contact deletion Issue #1120
 2015-03-10 01:45:28 +01:00
Dominik Schürmann bce0fe6221 Add additional email addresses in create key 2015-03-10 01:44:07 +01:00
Dominik SchürmannandAdithya Abraham Philip 3012001979 Show passphrase checkbox in create key 2015-03-10 03:46:10 +05:30
Dominik SchürmannandAdithya Abraham Philip 7d2e2e3eec Make create key wizard step-by-step 2015-03-10 02:49:34 +05:30