cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,060 Commits 1 Branch 0 Tags
237a0b1805fc759693cfe2aaeffad1cbccecd08e
Commit Graph

1552 Commits

Author SHA1 Message Date
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
f87d21a661 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-05-05 09:27:07 +02:00
Dominik Schürmann
855b8c4ef9 Fix nullpointer in file decryption 2015-05-05 09:05:39 +02:00
William Faulk
b06e7cd737 Fix Bluetooth share without breaking others 2015-05-04 16:46:15 -04:00
Dominik Schürmann
291f95db5a Fix revoked/expired state in decrypt activity 2015-05-04 21:13:07 +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
aa68c41f5a Fix yubikey strings 2015-05-01 14:48:57 +02:00
Dominik Schürmann
c88d2e42b7 Fix key creation string and display 2015-04-30 18:57:51 +02:00
Dominik Schürmann
7c275fed9d API: Allow selection of decryption keys when decryption fails 2015-04-30 18:45:43 +02:00
Daniel Ramos
e159e619d2 -removed unneeded inputType attribute from xml files (+1 squashed commits) 
Squashed commits:

[ef54e68] -code style fixing
 2015-04-30 00:54:56 +01:00
Vincent Breitmoser
fc61208ce7 small ui niceties 2015-04-27 19:49:42 +02:00
Vincent Breitmoser
4ba2e4bcdd display creation dates for ambiguous user ids 2015-04-27 17:46:10 +02:00
Vincent Breitmoser
40834d1fcd add distinct status for messages signed by "your" key 2015-04-27 17:46:07 +02:00
Vincent Breitmoser
32db4e393b display creation dates for ambiguous user ids 2015-04-27 17:45:50 +02:00
Vincent Breitmoser
0ad66eb510 add distinct status for messages signed by "your" key 2015-04-27 14:40:52 +02:00
Vincent Breitmoser
ef8506fc26 small changes for performance 2015-04-27 13:52:00 +02:00
Daniel Ramos
674f377bd4 Merge branch 'development' of https://github.com/open-keychain/open-keychain into development 2015-04-26 18:27:07 +01:00
Dominik Schürmann
4c74dbe11e UI fixes for Android < 5 2015-04-26 01:28:29 +02:00
Vincent Breitmoser
68b3c22f7b Merge remote-tracking branch 'origin/development' into linked-identities 2015-04-26 01:02:42 +02:00
Vincent Breitmoser
1865852ccc Merge remote-tracking branch 'origin/development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
	OpenKeychain/src/main/res/menu/decrypt_menu.xml
 2015-04-26 01:02:22 +02:00
Dominik Schürmann
4732bc5744 Remove unused decrypt result layout 2015-04-26 00:36:37 +02:00
Dominik Schürmann
c442d3bd0d Put decrypt result in toolbar, some ui fixes for decrypt 2015-04-26 00:33:26 +02:00
Dominik Schürmann
f1f0126048 Switch to new support lib version 22.1 2015-04-25 23:40:26 +02:00
Dominik Schürmann
5d6eb2930c Update in-app contributor list 2015-04-25 15:10:15 +02:00
Dominik Schürmann
f8af6e3387 Update lib section in about 2015-04-25 14:09:55 +02:00
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
Vincent Breitmoser
d6d678dae3 update uris and cookie patterns, plus some stylings 2015-04-25 03:40:38 +02:00
Vincent Breitmoser
608b66d192 change HttpsEditText to generic PrefixEditText 2015-04-25 03:39:40 +02:00
Vincent Breitmoser
9c174ff71d fix encrypt activity layout 2015-04-24 19:17:08 +02:00
Vincent Breitmoser
96853a15ee revamp decrypt ui 2015-04-24 19:17:05 +02:00
Vincent Breitmoser
6de403c21a fix encrypt activity layout 2015-04-24 19:16:15 +02:00
Vincent Breitmoser
ca9ab02b7b revamp decrypt ui 2015-04-24 19:00:33 +02:00
Vincent Breitmoser
b12aa63cb3 use CryptoOperationFragment for linked id fragments, and some warning cleanup 2015-04-24 15:44:33 +02:00
Vincent Breitmoser
b4aec3114d Merge branch 'development' into linked-identities 
Conflicts:
	Graphics/update-drawables.sh
	OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
 2015-04-24 14:18:01 +02:00
vectorijk
b323fc29c2 Fix #1197 Switch to MaterialDrawer library 2015-04-24 03:22:15 -07:00
vectorijk
3ee2c6fc6a Introduce and Switch to mikepenz/MaterialDrawer 2015-04-24 00:00:58 -07:00
Daniel Ramos
40122d61cc Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
 2015-04-24 03:44:57 +01: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
Manoj Khanna
aecebd2ac0 Fixed Snackbar behind layout 
Surrounded string with quotes
 2015-04-22 19:22:12 +05:30
Adithya Abraham Philip
2571d25058 keyserver verification on addition 2015-04-22 06:16:50 +05:30
Adithya Abraham Philip
91443c2f43 support for handling keyserver urls from browser, added documentation 2015-04-20 21:42:51 +05:30
Dominik Schürmann
3668c8897d Fix YubiKey naming, cleanup 2015-04-15 10:02:41 +02:00
Daniel Ramos
d097131a3d -Improved email sanity verifications when adding emails when creating a new Key 
-fixed a few NFC crashes
-fixed a few instances when showing the keyboard would crash the Activity
-fixed a case where adding new emails would crash the app if the user went back and forth between the Add Email fragment and the Add Name fragment.
 2015-04-14 03:40:59 +01:00
Dominik Schürmann
a545d50f4b Pull from transifex 2015-04-14 00:40:28 +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
Vincent Breitmoser
c216346097 minor ui and wording changes 2015-04-09 16:06:37 +02:00
Vincent Breitmoser
a4b7daf266 Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
 2015-04-09 13:57:56 +02:00
Adithya Abraham Philip
083cd100ce hide linked system contact card if no contact present 2015-04-08 01:11:55 +05:30