Commit Graph

4259 Commits

Author SHA1 Message Date
Dominik Schürmann
64ca19464b Set different titles when changing in nav drawer 2015-04-25 14:37:55 +02:00
Dominik Schürmann
28da731201 Fix empty screen when clicking on encrypt in details view 2015-04-25 14:15:38 +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
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
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
Daniel Ramos
76841ca873 Merge branch 'feature/emailImprovements' into localdev 2015-04-24 03:36:08 +01:00
Daniel Ramos
d9cabf8dc4 -Fixed a crash while recreating CreateKeyEmailFragment
-Email data is properly restored while rotating the Activity.
-Added necessary logic to guarantee that an email is actually valid before continuing, there are verifications for empty, duplicated and invalid formatted emails for both additional and main email.
2015-04-24 03:35:30 +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
Dominik Schürmann
a244a58b5a Merge pull request #1218 from manojkhannakm/development
Fixed Snackbar behind layout
2015-04-22 15:57:45 +02:00
Manoj Khanna
aecebd2ac0 Fixed Snackbar behind layout
Surrounded string with quotes
2015-04-22 19:22:12 +05:30
Dominik Schürmann
43484c8236 Merge pull request #1214 from adithyaphilip/keyserver-verification
Verifying Newly Added Keyservers
2015-04-22 13:13:36 +02:00
Adithya Abraham Philip
2571d25058 keyserver verification on addition 2015-04-22 06:16:50 +05:30
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
Adithya Abraham Philip
09cb00a87c corrected possible null pointer 2015-04-22 03:32:59 +05:30
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
Adithya Abraham Philip
5a4a8f2b6a added log to QR code scan/import fail 2015-04-21 23:16:33 +05:30
Vincent
a658d3c1e1 Merge pull request #1210 from josecastillo/development
Maintain client-side state for PIN verification operations
2015-04-21 10:28:16 +02:00
Joey Castillo
9d56fc9768 Fix for initialization failure when card returns FCI in data field. 2015-04-20 19:12:01 -04:00
Joey Castillo
104fdcd6bf Track state of PIN verification on smart card; only verify when needed. 2015-04-20 19:11:53 -04: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
Adithya Abraham Philip
91443c2f43 support for handling keyserver urls from browser, added documentation 2015-04-20 21:42:51 +05:30
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
Joey Castillo
f85befd982 Consolidate PIN verify operation in nfcVerifyPIN method. 2015-04-14 16:19:28 -04:00
Joey Castillo
f981c36bf4 Move PIN verify inside sign/decrypt operation and set correct mode. 2015-04-14 15:34:25 -04: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
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
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