cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,052 Commits 1 Branch 0 Tags
933d5402a2fc51fbf4f8d04d0bc96248d4966f2c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann 933d5402a2 Remove old navigation drawer dependency 2015-04-25 14:06:53 +02:00
Dominik Schürmann de575a618a Merge pull request #1220 from vectorijk/SwitchToMaterialDrawer 
Switch to MaterialDrawer library
 2015-04-25 13:59:56 +02:00
Dominik Schürmann 702c28854b Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-04-22 19:00:47 +02:00
Dominik Schürmann a4e871030d Update changelog 2015-04-22 19:00:18 +02:00
Dominik Schürmann a244a58b5a Merge pull request #1218 from manojkhannakm/development 
Fixed Snackbar behind layout
 2015-04-22 15:57:45 +02:00
Dominik Schürmann 43484c8236 Merge pull request #1214 from adithyaphilip/keyserver-verification 
Verifying Newly Added Keyservers
 2015-04-22 13:13:36 +02:00
Dominik Schürmann b0c87e2372 Merge pull request #1212 from adithyaphilip/qr-result 
Corrected possible null pointer with key import
 2015-04-22 01:04:22 +02:00
Dominik Schürmann 713f6ba6c7 Simplify ImportKeysProxyActivity 2015-04-21 20:15:10 +02:00
Dominik Schürmann 7d273ecfa6 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-04-21 20:09:52 +02:00
Dominik Schürmann b0efee2526 Merge pull request #1209 from adithyaphilip/qr-result 
Make Logs not Toasts - Fixes Issue #1198
 2015-04-21 20:09:31 +02:00
Dominik Schürmann 71aeffdfc8 Merge pull request #1207 from adithyaphilip/register-keyserver-urls 
support for handling keyserver urls from browser, added documentation
 2015-04-20 18:33:45 +02:00
Dominik Schürmann 7a097dd5df Cleanup in HkpKeyserver 2015-04-20 13:53:00 +02:00
Dominik Schürmann f2d3abd4c9 Format KeyListFragment 2015-04-18 16:52:02 +02:00
Dominik Schürmann 555b0bf757 Temporarily fix devices without nfc 2015-04-18 16:50:52 +02:00
Dominik Schürmann baac30508d Graphic stuff 2015-04-17 17:30:03 +02:00
Dominik Schürmann 413c4bce59 Use https for zxing lib 2015-04-17 17:29:45 +02:00
Dominik Schürmann b440456acc Use portrait mode for qr code scanning 2015-04-15 10:25:56 +02:00
Dominik Schürmann e332699c9c More cleanup 2015-04-15 10:10:53 +02:00
Dominik Schürmann 3668c8897d Fix YubiKey naming, cleanup 2015-04-15 10:02:41 +02:00
Dominik Schürmann f41758261f Clean up NfcOperationActivity 2015-04-15 09:55:29 +02:00
Dominik Schürmann 84deba9886 Reformat nfcVerifyPIN 2015-04-15 09:50:34 +02:00
Dominik Schürmann 284ae594bb Merge pull request #1200 from josecastillo/development 
Fix for NFC signing operations: move PIN verify inside sign/decrypt operation and set correct mode.
 2015-04-15 09:49:09 +02:00
Dominik Schürmann ddeb88e72a Contribution info 2015-04-14 17:46:10 +02:00
Dominik Schürmann 789a320127 Contribution info 2015-04-14 17:44:48 +02:00
Dominik Schürmann 66554607d0 Remove unused includes in settings.gradle 2015-04-14 09:37:17 +02:00
Dominik Schürmann 191784bf4b Update libs 2015-04-14 00:48:45 +02:00
Dominik Schürmann a545d50f4b Pull from transifex 2015-04-14 00:40:28 +02:00
Dominik Schürmann b288e5f4fe Update html-textview, fix build 2015-04-14 00:06:05 +02:00
Dominik Schürmann 71024460cb Reformat comment in PassphraseCacheService 2015-04-13 23:53:46 +02:00
Dominik Schürmann 1923942fc9 Buffer ascii armored encryption/signatures 2015-04-13 23:41:16 +02:00
Dominik Schürmann f12c7b64d8 Merge pull request #1193 from adithyaphilip/auto-refresh-contacts 
Immediate display of contact card, fixed contact picture display issue, hides card if no contact
 2015-04-13 23:33:23 +02:00
Dominik Schürmann 256d644d03 IMplement CryptoInputParcelCacheService 2015-04-13 23:29:35 +02:00
Dominik Schürmann 9fc001c9b9 Clearer var naming 2015-04-12 21:23:59 +02:00
Dominik Schürmann 4a55308741 More simplifications to PassphraseCacheService 2015-04-12 20:12:10 +02:00
Dominik Schürmann c3d6637e6a Simplify PassphraseCacheService 2015-04-12 19:55:10 +02:00
Dominik Schürmann fd09b9d380 Remove html-textview reference from settings.gradle 2015-04-12 18:39:37 +02:00
Dominik Schürmann 2512d3007e Switch to html-textview from JCenter 2015-04-12 18:13:03 +02:00
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