cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,596 Commits 1 Branch 0 Tags
115c46d015bbbbcf6223d3e13844daa98d12255c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann 115c46d015 Update Android Gradle Plugin to 2.0 with workarounds 2016-04-12 19:28:00 +02:00
Dominik Schürmann 060a5a1815 Merge branch 'backup-code' 2016-04-12 19:08:32 +02:00
Dominik Schürmann ef355aa001 Fix in-app help for backup codes 2016-04-12 19:08:20 +02:00
Dominik Schürmann f7654af00b Revert usage of masked-edittext, back to plain edittexts for backup codes 2016-04-12 19:06:08 +02:00
Dominik Schürmann ff9226c25c Fix strings 2016-04-12 16:15:07 +02:00
Dominik Schürmann 8efef3d248 Merge pull request #1828 from nmikhailov/holder_text_fix 
Add missing keyholder string param
 2016-04-12 09:25:34 +02:00
Dominik Schürmann d3a34adb28 Merge branch 'kepuss-okhttp3' 2016-04-09 18:34:12 +02:00
Dominik Schürmann c8e5395d4e Use cert pinning only if available 2016-04-09 18:34:00 +02:00
Dominik Schürmann 2d762e55da Okhttp3 cleanups, docs, and fix timeouts for default client 2016-04-09 11:53:37 +02:00
Dominik Schürmann 4edb805ba1 Update keybase submodule 2016-04-09 11:45:09 +02:00
Dominik Schürmann c4de57d4f6 Merge pull request #1782 from fiaxh/share_key_mime 
Set MIME application/pgp-keys when sending a key
 2016-03-24 13:52:04 +01:00
Dominik Schürmann f3712101c1 Version 3.9.4 2016-03-15 23:53:03 +01:00
Dominik Schürmann 2b43ba438b Version 3.9.3 2016-03-15 18:01:27 +01:00
Dominik Schürmann faae8bc3d9 Merge pull request #1780 from AlexFJW/backup-code-selection 
Provisional backup-code text selection fix
 2016-03-12 11:25:46 +01:00
Dominik Schürmann 48867e89bd Update okhttp2, tokenautomcomplete, zxing 2016-03-10 12:25:13 +01:00
Dominik Schürmann 9f15e7494b Merge pull request #1774 from fiaxh/keyserver_select_dark 
Fix display of keyserver item in dark theme in SettingsKeyserverActivity
 2016-03-10 03:04:36 +01:00
Dominik Schürmann bd2c41df22 Merge pull request #1769 from 007durgesh219/Issue#1766 
Fix NullPointerException in ImportKeysListFragment.checkAndRequestReadPermission, #1766
 2016-03-08 17:23:12 +01:00
Dominik Schürmann 305fee5ea1 Open keyboard for backup code 2016-03-08 16:20:48 +01:00
Dominik Schürmann 7882f16331 Make it a style to reduce code duplication 2016-03-08 16:10:06 +01:00
Dominik Schürmann 456535729c Add more responsive text sizes 2016-03-08 15:57:48 +01:00
Dominik Schürmann e8875adaa4 Using new size qualifiers 2016-03-08 15:47:32 +01:00
Dominik Schürmann 5379f64d08 Revert "Use non-breaking spaces for backup code MaskedEditText" 
This reverts commit 0feb4d074c.

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
 2016-03-08 15:01:49 +01:00
Dominik Schürmann d6520cde04 Fix code style and documentation in BaseSecurityTokenNfcActivity 2016-03-08 04:04:18 +01:00
Dominik Schürmann 84fb5e45b1 Fix documentation of nfcGenerateOnCardKey 2016-03-08 03:01:32 +01:00
Dominik Schürmann e45d671ce9 Fix comment in nfcGenerateOnCardKey 2016-03-08 02:34:57 +01:00
Dominik Schürmann 3d1d268997 Add nfcGenerateOnCardKey by Joey Castillo before it gets lost 2016-03-08 02:27:56 +01:00
Dominik Schürmann b6db814951 Merge branch 'kepuss-okHttpLinkedToken' 2016-03-07 00:40:49 +01:00
Dominik Schürmann c419942a3f Merge branch 'okHttpLinkedToken' of https://github.com/kepuss/open-keychain into kepuss-okHttpLinkedToken 2016-03-07 00:37:35 +01:00
Dominik Schürmann 4a3cd716eb Version 3.9.2 2016-03-07 00:24:13 +01:00
Dominik Schürmann 67178ef893 fix get key ids by removing another leftover 2016-03-07 00:23:43 +01:00
Dominik Schürmann 3f746bd281 Version 3.9.1 2016-03-06 14:14:34 +01:00
Dominik Schürmann 005aed8df1 Merge pull request #1757 from 007durgesh219/Issue#1752 
Fix K-9 stable: OpenPGP: Unknown compression algorithm #1752
 2016-03-06 14:12:32 +01:00
Dominik Schürmann 6a3832659e Merge pull request #1747 from runnerway/fix-alreadyadded 
Fix duplicate file insertion while encrypting
 2016-03-06 00:56:04 +01:00
Dominik Schürmann 201c38ec02 Merge pull request #1750 from 007durgesh219/Issue#1746 
Fix Dark theme no longer works in main screen on android 5, Issue#1746
 2016-03-05 18:28:02 +01:00
Dominik Schürmann 82c3426c6f Merge pull request #1738 from runnerway/storage-permission-fix 
Always check read permission
 2016-03-05 16:12:13 +01:00
Dominik Schürmann 97d157a282 Merge pull request #1751 from runnerway/decrypt-filename 
Fix wrong behavior of third-party apps while opening files after decryption
 2016-03-05 15:06:43 +01:00
Dominik Schürmann 556c04db82 Merge pull request #1743 from advaita13/master 
Contact Synchronisation Notification
 2016-03-03 22:45:38 +01:00
Dominik Schürmann 1cbecb1b3b Add missing 2 EUR selection for donation 2016-03-03 15:18:31 +01:00
Dominik Schürmann eef8abcf80 Version 3.9 2016-03-03 13:34:08 +01:00
Dominik Schürmann 7d3b903690 Transifex: pt_BR 2016-03-03 13:31:46 +01:00
Dominik Schürmann a3a87fad87 Update openpgp-api submodule 2016-03-03 13:12:51 +01:00
Dominik Schürmann 568e0ff380 Merge pull request #1737 from runnerway/backup-code-fix 
Fix backup code comparison
 2016-03-02 00:21:27 +01:00
Dominik Schürmann 067d5fd0b0 Comment out verification for submodules 2016-02-29 23:15:27 +01:00
Dominik Schürmann 3fd5f2c097 Update to support lib 23.2.0 2016-02-29 23:13:51 +01:00
Dominik Schürmann ff0edb2bfe Merge branch 'master' of github.com:open-keychain/open-keychain 2016-02-23 16:06:59 +01:00
Dominik Schürmann 73ce6fc7bb Passthrough of data Intent in methods of ApiPendingIntentFactory instead of constructor 2016-02-23 16:06:54 +01:00
Dominik Schürmann c1d268a5ec Merge branch 'unyoungwax-qr-code-fullscreen' 2016-02-23 10:57:33 +01:00
Dominik Schürmann 0784a0b430 Merge pull request #1722 from open-keychain/api-seperation 
Better seperation of remote activities
 2016-02-22 15:21:40 +01:00
Dominik Schürmann f54f12c48c Extend documentation, proper method naming, use of deprecated method annotation 2016-02-22 15:19:06 +01:00
Dominik Schürmann 6379ce1faa Use FLAG_IMMUTABLE 2016-02-22 15:06:45 +01:00
Dominik Schürmann d1eacf9b27 Move PendingIntent creation into factory 2016-02-22 15:06:45 +01:00
Dominik Schürmann 15488c5445 Split remote methods from activities for better seperation 2016-02-22 15:06:45 +01:00
Dominik Schürmann eef27a544f Extract service parts from SecurityTokenOperationActivity 2016-02-22 15:06:45 +01:00
Dominik Schürmann c9018e1844 Use BC provider as default one 2016-02-21 17:23:25 +01:00
Dominik Schürmann bb997920f5 Split RemoteServiceActivity into multiple activities 2016-02-15 13:25:55 +01:00
Dominik Schürmann 0b00410123 travis: use new hostname addon instead of workaround 2016-02-10 20:02:50 +01:00
Dominik Schürmann e593ca87d2 Merge pull request #1716 from open-keychain/backup-v2 
Backup Format v2
 2016-02-10 19:14:56 +01:00
Dominik Schürmann 0e22813f03 Fix landscape orientation 2016-02-10 19:09:55 +01:00
Dominik Schürmann 0feb4d074c Use non-breaking spaces for backup code MaskedEditText 2016-02-10 18:48:27 +01:00
Dominik Schürmann a2ea509f06 Backup format v2: redesign restore dialog 2016-02-10 18:48:27 +01:00
Dominik Schürmann 713f3076f4 Backup format v2: redesigned backup code fragment with masked edit text 2016-02-10 18:48:27 +01:00
Dominik Schürmann 923b543e4d Add masked-edittext library 2016-02-10 18:48:27 +01:00
Dominik Schürmann a94713103b Merge pull request #1705 from fidesmo/feature-better-transaction-animation 
Better transaction animation
 2016-02-10 17:44:52 +01:00
Dominik Schürmann 751298a4d8 Fix EUR symbol 2016-02-10 12:34:44 +01:00
Dominik Schürmann c22e2baa79 Fix SecurityException on Android 6 due to remove contacts on disabled sync 2016-02-09 21:14:07 +01:00
Dominik Schürmann b44f73c819 Fix jacoco task 2016-02-09 21:02:43 +01:00
Dominik Schürmann 2bf9634fd6 Add donation fragment 2016-02-09 20:48:24 +01:00
Dominik Schürmann 2249b025bd Add ignore = dirty to submodules config 2016-02-09 18:05:41 +01:00
Dominik Schürmann 43e7956959 Merge pull request #1715 from open-keychain/bouncy 
Switch to Bouncy Castle
 2016-02-09 17:57:55 +01:00
Dominik Schürmann 08393bc5c3 Exclude robolectric's transitive bouncycastle dependency 2016-02-09 01:00:40 +01:00
Dominik Schürmann fa2958c65a Remove leftovers from spongycastle 2016-02-09 00:34:16 +01:00
Dominik Schürmann 79db5c0ebe Replace spongycastle with bouncycastle 2016-02-09 00:24:46 +01:00
Dominik Schürmann 55b4790abd Add bouncycastle submodule 2016-02-09 00:22:20 +01:00
Dominik Schürmann 70662e21b0 Remove spongycastle submodule 2016-02-09 00:21:04 +01:00
Dominik Schürmann 2c7e5ab8df Merge pull request #1713 from open-keychain/unlink-contact 
Deletes linked OpenKeychain contacts if sync is disabled
 2016-02-06 14:17:49 +01:00
Dominik Schürmann cbf6f15d91 Fix number keypad preference 2016-02-04 12:50:21 +01:00
Dominik Schürmann 10ce81bd60 Merge pull request #1706 from open-keychain/keyserverservice-fix 
Prevent Rare KeyserverSyncAdapterService Crash
 2016-01-30 19:38:21 +01:00
Dominik Schürmann 025d2c5d29 Merge pull request #1683 from eighthave/master 
allow "panic button" apps to clear all passphrases
 2016-01-26 19:58:08 +01:00
Dominik Schürmann 09b80e0368 Merge branch 'master' of github.com:open-keychain/open-keychain 2016-01-20 12:45:50 +01:00
Dominik Schürmann 681a201a69 No PendingIntent for RESULT_NO_SIGNATURE, RESULT_INVALID_SIGNATURE 2016-01-20 12:45:44 +01:00
Dominik Schürmann d8235e0013 Lowercase ttl strings 2016-01-14 13:15:29 +01:00
Dominik Schürmann 8cd28036ef Merge pull request #1614 from fidesmo/feature-introduce-nfc-handling-via-nordpol 
Use Nordpol for BaseNfcActivity
 2016-01-13 14:38:40 +01:00
Dominik Schürmann d030f4f203 Version 3.8.2 2016-01-13 14:28:50 +01:00
Dominik Schürmann 5d912657ca Pull from transifex 2016-01-13 14:28:31 +01:00
Dominik Schürmann 808a9e4f54 Version 3.8.1 2016-01-12 15:18:05 +01:00
Dominik Schürmann 2c4bf2fb51 Add facebook key import to changelog 2016-01-12 01:05:27 +01:00
Dominik Schürmann 37ad772c39 Version 3.8 2016-01-11 18:33:42 +01:00
Dominik Schürmann 49dc5166cd Pull from transifex 2016-01-11 18:33:16 +01:00
Dominik Schürmann 5e3e6e2d62 Fix singleTop definitions 2016-01-11 18:04:09 +01:00
Dominik Schürmann c68b39211e Merge branch 'master' of github.com:open-keychain/open-keychain 2016-01-11 17:39:59 +01:00
Dominik Schürmann 81f23e8b7f Merge pull request #1666 from open-keychain/file-import-fix 
Fixed File Import issue due to onResumeFragments
 2016-01-11 17:39:53 +01:00
Dominik Schürmann baf0735c96 Merge branch 'master' of github.com:open-keychain/open-keychain 2016-01-11 17:35:20 +01:00
Dominik Schürmann 900c80c25c Changelog 3.8 2016-01-11 17:35:15 +01:00
Dominik Schürmann 574bb4ff45 Remove old screenshots, move api demo screenshots 2016-01-11 09:22:53 +01:00
Dominik Schürmann 5f0b07773e Pull from transifex 2016-01-11 08:40:01 +01:00
Dominik Schürmann fd3a1e900e Move edit key configuration to menu 2016-01-11 08:32:41 +01:00
Dominik Schürmann f691ef2a26 Error out when editing a stripped key 2016-01-11 08:13:51 +01:00
Dominik Schürmann aa924c2560 Add transifex advanced resource 2016-01-11 07:45:01 +01:00
Dominik Schürmann cc917857b0 Advanced screen, warning fragment 2016-01-11 07:42:00 +01:00
Dominik Schürmann 93327dccce Use tor icon for settings screen 2016-01-11 07:39:35 +01:00