cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,999 Commits 1 Branch 0 Tags
f44256589643df6c3dcad0f3c9ea263452b7e8eb
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann f442565896 Update api lib 2015-04-10 17:36:34 +02:00
Dominik Schürmann 7074b44347 Cache CryptoInputParcel in OpenPgpService 2015-04-10 15:58:37 +02:00
Dominik Schürmann 5ea01a15d3 Remove unused AlgorithmNames 2015-04-10 15:21:02 +02:00
Dominik Schürmann ae4fc47443 Add license headers 2015-04-10 15:20:36 +02:00
Dominik Schürmann 702a77ccd1 Externalize Parcelable caching 2015-04-10 15:16:13 +02:00
Dominik Schürmann a467480717 Fix signing subkey selection in remote service 2015-04-07 13:49:34 +02:00
Dominik Schürmann 8e5d0d1682 Fix nullpointer with Intent API, fix clearing of encrypt file list, notify when adding a range of input uris 2015-04-04 19:01:03 +02:00
Dominik Schürmann cc44ff1a8b Prepare decrypt UI for input parcel 2015-03-31 15:44:37 +02:00
Dominik Schürmann 6c706f8a90 Rename advanced to extended 2015-03-31 10:49:33 +02:00
Dominik Schürmann c37e7ef241 Better check if file is already added 2015-03-31 01:53:37 +02:00
Dominik Schürmann ce3a1f4c33 Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychain into v/crypto-input-parcel 2015-03-31 00:32:56 +02:00
Dominik Schürmann 7c258bdedd From passphrase to password 2015-03-31 00:32:48 +02:00
Dominik Schürmann aea52f2e6f Simplify passphrase dialog design 2015-03-31 00:24:08 +02:00
Dominik Schürmann d67b546ec5 Dont show slinger button in spinner 2015-03-30 23:23:54 +02:00
Dominik Schürmann 5052d44b7b Fix scrollbar 2015-03-30 20:48:18 +02:00
Dominik Schürmann a3276a4485 Use RecyclerView in EncryptFilesFragment 2015-03-30 20:41:29 +02:00
Dominik Schürmann 2050be3995 Add TokenAutoComplete and StickyListHeaders as maven dependencies instead of git submodules 2015-03-30 16:08:25 +02:00
Dominik Schürmann 91494dd3a3 Merge branch 'development' into v/crypto-input-parcel 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java
 2015-03-30 15:53:44 +02:00
Dominik Schürmann 726ff0b501 Fix strings with email address 2015-03-29 21:00:36 +02:00
Dominik Schürmann 7ffb55faaa Merge branch 'development' into v/crypto-input-parcel 2015-03-29 21:00:06 +02:00
Dominik Schürmann 95f1527afe Fixing crashes with new encrypt ui 2015-03-29 20:37:54 +02:00
Dominik Schürmann 6b48ddd717 Merge pull request #1188 from adithyaphilip/import-message-error 
Corrected import error message, changed style to WARN
 2015-03-28 18:11:26 +01:00
Dominik Schürmann 73bccd6c58 Merge pull request #1187 from Hiperzone/development 
-Fixed a situation where additional emails could be duplicated when crea...
 2015-03-28 18:10:32 +01:00
Dominik Schürmann b82f273284 Start reworking decrypt ui classes 2015-03-27 00:55:55 +01:00
Dominik Schürmann 13f4cc4ad3 Refactoring of EncryptTextActivity 2015-03-27 00:40:37 +01:00
Dominik Schürmann adbe5ab63f Update gradle plugin, update gradle test plugin 2015-03-26 22:56:28 +01:00
Dominik Schürmann f62a5eded4 Merge branch 'development' into v/crypto-input-parcel 2015-03-26 22:48:06 +01:00
Dominik Schürmann d6368db564 Merge pull request #1182 from iseki-masaya/1045 
#1045: Add a loop for multiple key export.
 2015-03-26 12:35:50 +01:00
Dominik Schürmann 76db0b3b8e Start refactoring encrypt ui, EncryptFileActivity no longer crashing 2015-03-26 11:04:20 +01:00
Dominik Schürmann 1ef63f3187 Fix certify with CryptoInputParcel 2015-03-25 11:12:52 +01:00
Dominik Schürmann 5e024bba2e Remove backward compat in CertifyKeyFragment 2015-03-25 10:50:55 +01:00
Dominik Schürmann 040cf42cb0 Merge branch 'development' into v/crypto-input-parcel 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
 2015-03-24 13:19:43 +01:00
Dominik Schürmann eeccd7cd14 3.2beta3 2015-03-23 23:04:35 +01:00
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