cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,767 Commits 1 Branch 0 Tags
55e14cb45bc17c36cbdbaf80fbb8221069d01e3a
Commit Graph

5767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Mikhailov
3d538d885e OTG: Usb device manager fixes 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
bd2906a887 OTG: Add usb device manager prototype 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
834440199a OTG: update methods 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
65f17d7449 OTG: port old primitives from otg_alt branch 2016-04-14 22:48:01 +06:00
Durgesh
8f88efe13f Fix Crash when no encryption subkey is available, Issue #1817 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-04-14 11:05:55 +05:30
Durgesh
72d2a627ff Add + button besides TokenAutoComplete, Issue #925 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-04-14 02:43:32 +05:30
Dominik Schürmann
e08ae31797 Remove old keybase path 2016-04-13 18:57:21 +02:00
Dominik Schürmann
a16c4bcc30 Version 3.95 beta 2016-04-13 17:12:48 +02:00
Dominik Schürmann
ab323bddab Fix string 2016-04-13 17:00:24 +02:00
Dominik Schürmann
8bcd4003a9 KeybaseLib workaround 2016-04-12 19:42:54 +02:00
Dominik Schürmann
4ac63de83b Fix wrapper URL 2016-04-12 19:33:54 +02:00
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
Lubo Viluda
8933263665 unnecesary code removed 
- setContentView removed
- R.layout.redirect_import_keys_activity.xml removed
 2016-04-12 16:43:06 +02:00
Dominik Schürmann
ff9226c25c Fix strings 2016-04-12 16:15:07 +02:00
Lubo Viluda
a7a0d9dd4b Unnecesary code removed and string repaired 
- Unnecesary import from RedirectImportKeyActivity.java removed
- ..\value-w820dp\dimens.xml was unnecesary
- \..value\dimens.xml unnecasary line
- string sources repaired
 2016-04-12 15:41:42 +02:00
fiaxh
6881754062 Better handle user_id sidecases while splitting 2016-04-12 13:30:43 +02:00
fiaxh
2d73b74dde Use email field to match email in KeychainProvider 
fixes #1699
 2016-04-12 11:49:48 +02:00
Vincent
b55c505054 Merge pull request #1772 from runnerway/importkey-encrypted 
Handle encrypted files in "import key" file selection
 2016-04-12 10:13:30 +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
Nikita Mikhailov
8476999922 Add missing keyholder string param 2016-04-11 00:02:05 +06: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
Michal Kepkowski
7b97c2bbed KeyBaseLib response Client 2016-04-08 19:10:59 +02:00
Michal Kepkowski
26bfe06d80 cleaning 2016-04-06 19:25:10 +02:00
Michal Kepkowski
d9988a8cda Merge branch 'master' into okhttp3 2016-04-06 19:16:10 +02:00
Michal Kepkowski
dac5f1db08 OKhttp url factory 2016-04-06 19:10:00 +02:00
Vincent
88ba5688d8 Merge pull request #1804 from vhazali/tint-linked-contact-picture-in-toolbar 
tint linked contact picture in toolbar #1298
 2016-04-06 15:33:03 +02:00
Vincent
d0a424f9f2 Merge pull request #1818 from 007durgesh219/Issue#1468 
Fix Unusable signing key not properly disabled, Issue #1468
 2016-04-06 15:31:22 +02:00
Durgesh
aec4744b31 Fix Unusable signing key not properly disabled, Issue #1468 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-04-05 02:08:18 +05:30
Lubo Viluda
30afa3a193 Activity renamed 
Activity renamed from startScanActivity to  startQrCodeCaptureActivity
 2016-04-04 20:03:05 +02:00
Lubo Viluda
1e97149ce1 Changed activity during RedirectKeysActivity 
QrCodeCaptureActivity is open instead ImportKeysActivity
 2016-04-04 19:56:00 +02:00
Victor Hazali
db3e90821c Used a constant instead of magic number for colour 
Explicitly stated the blending mode
 2016-04-04 18:52:22 +08:00
Vincent
77678886fc Merge pull request #1808 from vhazali/warn-when-stripping-master-key 
Warn when stripping master key #1554
 2016-04-04 11:37:50 +02:00
Vincent
e0463ec818 Merge pull request #1796 from AlexFJW/LimitCreateKeyOptions 
Refer to issue #1600 Limit create key options
 2016-04-04 10:53:11 +02:00
Vincent
f98279bc70 Merge pull request #1810 from ecki/patch-1 
Fix link to open-keychain/bouncycastle fork
 2016-04-03 10:23:21 +02:00
Bernd
f5d9d33bbc Fix link to open-keychain/bouncycastle fork 2016-04-02 00:51:29 +02:00
Alex Fong
cb9bdb3cf7 Redesigned subkey creation dialog and changed default key type created to RSA, 3072 bit. 
Added code to prevent removal of master subkey when modifying a new key.
 2016-04-01 23:12:11 +08:00
Victor Hazali
e627006fcf setTitle now uses resource id directly 2016-04-01 10:34:52 +08:00
Victor Hazali
8673777ae5 Corrected warning message 2016-04-01 10:34:27 +08:00
Vincent
9350d4666a Merge pull request #1764 from 007durgesh219/Issue#506 
Display Key in UploadKeyActivity Issue #506
 2016-04-01 00:50:52 +02:00
Durgesh
990948e3fb Fix Display Key in UploadKeyActivity, Issue #506 2016-03-31 20:52:34 +05:30
Victor Hazali
705a55a7a3 Corrected capitalisation of subkey 2016-03-30 06:09:13 +08:00
Victor Hazali
5411963aff Refactored switch statements to use constants 2016-03-30 06:07:59 +08:00
Victor Hazali
ce70568ff3 Extracted method 2016-03-30 05:37:31 +08:00
Victor Hazali
8ac7115f22 Merge commit '05accb49066a2693cfc1c92e29ad10112f957495' into warn-when-stripping-master-key 2016-03-30 05:33:11 +08:00