cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,448 Commits 1 Branch 0 Tags
a9c606d49bf7d4e7a30b7265cd1fb04ff1c3c01c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann a9c606d49b Create key wizard for blank YubiKey 2015-06-29 20:48:11 +02:00
Dominik Schürmann cf59a8fc30 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-06-29 15:08:30 +02:00
Dominik Schürmann 7d05905a7c Update support libs 2015-06-29 15:08:26 +02:00
Dominik Schürmann 5532a078b6 Remove html element in help_about 2015-06-29 14:02:17 +02:00
Dominik Schürmann 136397667a Force db upgrade on app start 2015-06-29 14:01:12 +02:00
Dominik Schürmann 93e6b6f9b5 Use signature-level signature for TemporaryStorageProvider and describe the security model 2015-06-29 10:54:27 +02:00
Dominik Schürmann 99c06b085b Add brackets in KeychainProvider 2015-06-29 09:24:34 +02:00
Dominik Schürmann 5b320d01d0 Use application/octet-stream as default type in TemporaryStorageProvider 2015-06-29 07:58:00 +02:00
Dominik Schürmann 4667a05c42 Guess mime type like support libs FileProvider 2015-06-29 07:54:58 +02:00
Dominik Schürmann 4150807559 Fix strings for transifex 2015-06-29 07:34:11 +02:00
Dominik Schürmann dce2e0b19c Language: Remember instead of caching 2015-06-26 17:54:36 +02:00
Dominik Schürmann 080d1c747a Merge pull request #1373 from thialfihar/feature/add-debug-app-name 
Add debug app name
 2015-06-26 15:15:38 +02:00
Dominik Schürmann 65e647cbf0 Merge pull request #1367 from open-keychain/fingerprint-mismatch 
Fixed fingerprint mismatch on web download of keys
 2015-06-25 09:14:42 +02:00
Dominik Schürmann 74cef32d25 Notification: follow design guidelines, fix #1313 2015-06-24 13:08:37 +02:00
Dominik Schürmann 8cd7e29540 New notify icon 2015-06-24 11:35:11 +02:00
Dominik Schürmann afeb0093e5 Merge pull request #1360 from moparisthebest/master 
New all-white status bar icon to fix issue #1356
 2015-06-24 11:23:39 +02:00
Dominik Schürmann 300fd8e0f2 Merge pull request #1352 from open-keychain/v/instrument 
instrumentation branch
 2015-06-17 19:56:13 +02:00
Dominik Schürmann 0b3317600b Cleanup in build.gradle 2015-06-16 00:08:17 +02:00
Dominik Schürmann 4f55b1f5d1 Use svg for build status 2015-06-11 22:41:17 +02:00
Dominik Schürmann 98ba424576 Fix coveralls 2015-06-11 13:12:45 +02:00
Dominik Schürmann 7f67658de9 Try coveralls support 2015-06-11 12:58:21 +02:00
Dominik Schürmann b856d82ae2 Jacoco support for local unit tests 2015-06-11 12:54:15 +02:00
Dominik Schürmann 7a5121894e Remove unused deps, fix travis 2015-06-11 00:36:05 +02:00
Dominik Schürmann 7c32098211 Add missing WorkaroundBuildConfig 2015-06-11 00:32:18 +02:00
Dominik Schürmann 6749b03d9a Fix debug/release build separation 2015-06-11 00:31:41 +02:00
Dominik Schürmann d16b09b2a6 Use new officially supported way for local unit tests, many dependencies upgraded for this, temporary disabled separate debug builds 2015-06-11 00:05:13 +02:00
Dominik Schürmann 05fcbcae7b Temporary fix for testDebug 2015-06-10 22:35:06 +02:00
Dominik Schürmann 260364e267 Use authority res strings 2015-06-10 20:00:29 +02:00
Dominik Schürmann aa31abd93f Allow debug build besides release build 2015-06-10 19:47:29 +02:00
Dominik Schürmann e6ea98fabc Improve FAQ entry for file manager 2015-06-08 22:46:08 +02:00
Dominik Schürmann 47f98493e2 Improve FAQ entry for file manager 2015-06-08 22:44:26 +02:00
Dominik Schürmann 28cb70d7dc Merge pull request #1333 from VPhantom/patch-1 
Explicit mention of dependency on 3rd party tool
 2015-06-08 22:41:37 +02:00
Dominik Schürmann 69c8ecd553 Merge pull request #1327 from adithyaphilip/fix-null 
Prevent NullPointerException due to Activity death
 2015-06-08 09:55:13 +02:00
Dominik Schürmann e2988c2a68 Fix comments in service 2015-06-01 15:52:07 +02:00
Dominik Schürmann 7d29901f64 Merge pull request #1320 from adithyaphilip/merge-services-new 
Merged CloudImportService and KeychainIntentService into KeychainService
 2015-06-01 15:50:09 +02:00
Dominik Schürmann b356df900f Better use HEAD instead of master to link to files 2015-06-01 10:26:30 +02:00
Dominik Schürmann af5fc66229 Merge pull request #1317 from adithyaphilip/master 
Merge key from Keyserver with that from Keybase instead of replacing
 2015-06-01 10:15:46 +02:00
Dominik Schürmann 784dbc087e Fix links to branch 2015-06-01 09:43:56 +02:00
Dominik Schürmann 213798dde1 branch info 2015-05-29 12:19:30 +02:00
Dominik Schürmann b794719020 Version 3.2.3 2015-05-29 02:33:04 +02:00
Dominik Schürmann 0bbd235380 Version 3.2.3 2015-05-29 02:27:30 +02:00
Dominik SchürmannandVincent Breitmoser 08afe42ea6 AssertionError instead of RuntimeException 2015-05-28 16:33:44 +02:00
Dominik SchürmannandVincent Breitmoser 79e356e04f Change convertFingerprintToHex to use RuntimeException 2015-05-28 16:33:43 +02:00
Dominik SchürmannandVincent Breitmoser 0b5c66ad0d Improve strings 2015-05-28 16:33:41 +02:00
Dominik SchürmannandVincent Breitmoser 1fcd9d3fde zxing lib is now on jcenter, see https://github.com/journeyapps/zxing-android-embedded/issues/39 2015-05-28 16:33:14 +02:00
Dominik Schürmann 1651f9fb61 AssertionError instead of RuntimeException 2015-05-21 13:32:22 +02:00
Dominik Schürmann 0456e04c1a Change convertFingerprintToHex to use RuntimeException 2015-05-21 11:00:52 +02:00
Dominik Schürmann 95875d727e Version 3.2.2 2015-05-21 10:35:31 +02:00
Dominik Schürmann 43d9e2ba76 Version 3.2.2 2015-05-21 10:34:39 +02:00
Dominik Schürmann 7e55ba1b36 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-05-21 10:32:15 +02:00
Dominik Schürmann 6b6ca4c18e Fix language based on feedback from transifex 2015-05-21 10:32:07 +02:00
Dominik Schürmann ab63fa8091 Fix language based on feedback from transifex 2015-05-21 10:31:46 +02:00
Dominik Schürmann 0df51b6140 Fix fingerprint length check in QR Code import 2015-05-19 19:09:39 +02:00
Dominik Schürmann 79b7cec94a Use Mode.ALPHANUMERIC for QR codes to save space 2015-05-19 19:09:32 +02:00
Dominik Schürmann 2cdaa75b01 Fix fingerprint length check in QR Code import 2015-05-19 19:07:58 +02:00
Dominik Schürmann c8266203f8 Use Mode.ALPHANUMERIC for QR codes to save space 2015-05-19 18:27:04 +02:00
Dominik Schürmann 0f520975e4 Improve strings 2015-05-19 16:12:04 +02:00
Dominik Schürmann 8c97bee14c zxing lib is now on jcenter, see https://github.com/journeyapps/zxing-android-embedded/issues/39 2015-05-15 13:31:01 +02:00
Dominik Schürmann 5c44f84009 3.2.1 2015-05-10 13:16:37 +02:00
Dominik Schürmann a35594201a Fixing rotate crashes in create key 2015-05-10 13:16:03 +02:00
Dominik Schürmann e4b7920edc Fix crash with v3 key fingerprints 2015-05-10 12:11:35 +02:00
Dominik Schürmann 0a29f6d3ac Cleanup 2015-05-10 11:52:39 +02:00
Dominik Schürmann 5b1bf888b4 Reformat manifest 2015-05-10 11:15:10 +02:00
Dominik Schürmann 874da746ea Add dontnote to proguard 2015-05-10 10:44:04 +02:00
Dominik Schürmann 3c0f82970c Workaround for Samsung Android 4.2 bug 2015-05-10 04:58:44 +02:00
Dominik Schürmann bfc57aefa5 Use snackbar lib from maven repo 2015-05-10 03:39:19 +02:00
Dominik Schürmann e14a2efcad Fixes and clarifications to app signature (or better certificate) pinning 2015-05-10 03:31:19 +02:00
Dominik Schürmann 6e326fb000 Add self-encrypt for old API 2015-05-10 03:00:42 +02:00
Dominik Schürmann b1ccfc6276 Merge pull request #1270 from adithyaphilip/linked-contact-crash 
Fixed sync on key import, crash for 'me' linked contact
 2015-05-09 18:17:37 +02:00
Dominik Schürmann 64a85721cb Update contrib section in README 2015-05-08 12:54:04 +02:00
Dominik Schürmann 63022aa96a Version 3.2 2015-05-06 14:32:17 +02:00
Dominik Schürmann dbff510783 Add screenshots 2015-05-06 14:22:53 +02:00
Dominik Schürmann dad19454e9 Pull from transifex 2015-05-06 14:04:03 +02:00
Dominik Schürmann c0c35d383e Update function graphic 2015-05-06 14:03:52 +02:00
Dominik Schürmann 13dff41350 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-05-06 13:56:36 +02:00
Dominik Schürmann 5ba071c61b Update openpgp-api lib 2015-05-06 13:55:40 +02:00
Dominik Schürmann a45aaa2277 Fix import of keyring with pub+sec key with same key id 2015-05-06 04:10:27 +02:00
Dominik Schürmann d2998ea80d Rename for consistency 2015-05-06 03:37:57 +02:00
Dominik Schürmann 8de6589c9d Renaming for consisitency 2015-05-06 03:29:04 +02:00
Dominik Schürmann f102ae5da5 Move error overlay into generalized DecryptFragment, better error handling in DecryptTextActivity 2015-05-06 03:26:42 +02:00
Dominik Schürmann 9c0187c6b4 Remove reference to deleted API Demo 2015-05-06 00:33:45 +02:00
Dominik Schürmann afc91fb918 Switch to new library repos 2015-05-06 00:08:04 +02:00
Dominik Schürmann f87d21a661 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-05-05 09:27:07 +02:00
Dominik Schürmann e3f5c6d01e Cleanup manifest 2015-05-05 09:26:57 +02:00
Dominik Schürmann 855b8c4ef9 Fix nullpointer in file decryption 2015-05-05 09:05:39 +02:00
Dominik Schürmann 9bf01bad14 Merge pull request #1235 from wfaulk/replacement_extra 
Fix Bluetooth share without breaking others
 2015-05-04 23:33:32 +02:00
Dominik Schürmann 291f95db5a Fix revoked/expired state in decrypt activity 2015-05-04 21:13:07 +02:00
Dominik Schürmann 2583f77f07 Fix cancel/skip in create key wizard 2015-05-04 20:47:19 +02:00
Dominik Schürmann f3090f2939 Display notify above keyboard in CreateKeyEmailFragment 2015-05-04 15:34:48 +02:00
Dominik Schürmann 2cd1cf9192 Fix email pattern 2015-05-04 15:27:19 +02:00
Dominik Schürmann 9698cb94e3 Merge branch 'Hiperzone-development' into development 2015-05-04 14:56:11 +02:00
Dominik Schürmann e1ca612bc4 Use more simple email validation regex 2015-05-04 14:55:56 +02:00
Dominik Schürmann 520f9abea3 Merge branch 'development' of https://github.com/Hiperzone/open-keychain into Hiperzone-development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
 2015-05-04 14:42:21 +02:00
Dominik Schürmann 045ea93ee1 Merge branch 'manojkhannakm-development' into development 2015-05-04 14:30:12 +02:00
Dominik Schürmann eb9019c78c Temporary fix for gradle dependency bug 2015-05-04 14:29:47 +02:00
Dominik Schürmann dedda1603c Fix dublicated code in CreateKeyEmailFragment 2015-05-04 14:19:16 +02:00
Dominik Schürmann 39c610c2d1 Merge branch 'development' of https://github.com/manojkhannakm/open-keychain into manojkhannakm-development 2015-05-04 14:18:10 +02:00
Dominik Schürmann b726dea244 license header for PgpCertifyOperation 2015-05-04 14:12:42 +02:00
Dominik Schürmann 51bb96742f Apply patch from https://github.com/open-keychain/open-keychain/issues/1222#issuecomment-98582938 2015-05-04 14:01:34 +02:00
Dominik Schürmann 4e425495e6 Apply patch from https://github.com/open-keychain/open-keychain/issues/1240 with db upgrade 2015-05-04 13:57:43 +02:00