Commit Graph

4305 Commits

Author SHA1 Message Date
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
Dominik Schürmann 02e86c90b6 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-05-04 13:31:38 +02:00
Dominik Schürmann 6ba4160786 Merge pull request #1238 from wfaulk/fix-tests
updated robolectric to support new android support libs
2015-05-04 13:29:43 +02:00
William Faulk 971ceb07d4 updated robolectric to support new android support libs 2015-05-03 14:06:01 -07:00
Dominik Schürmann aa68c41f5a Fix yubikey strings 2015-05-01 14:48:57 +02:00
Dominik Schürmann f3870cee29 More nullpointer fixes 2015-05-01 14:44:40 +02:00
Dominik Schürmann e91dc022fb Fix nullpointer in EncryptKeyCompletionView 2015-05-01 14:36:22 +02:00
Dominik Schürmann 5ad50b99a2 Remove time from key creation display 2015-04-30 19:02:33 +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
Dominik Schürmann f623411fb6 Update snackbar 2015-04-30 00:59:57 +02:00
Dominik Schürmann 14921e783f Update wrapper to verify local cache 2015-04-29 22:56:49 +02:00
Dominik Schürmann 41968206d3 Use own gradle wrapper to verify downloaded gradle package via SHA-256 sum. See https://github.com/gradle/gradle/pull/448 2015-04-29 20:43:46 +02:00
Dominik Schürmann db59cd0bbf Merge pull request #1233 from wfaulk/readme
Update README.md with new build info
2015-04-29 01:27:34 +02:00
William Faulk c9e0acec50 Update README.md with new build info 2015-04-28 19:10:45 -04:00
Vincent Breitmoser 3f1fa4d95c Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-04-28 18:22:42 +02:00
Vincent Breitmoser 8ab49b0766 fix crash when moving focus from EncryptKeyCompletionView with unknown text 2015-04-28 18:22:26 +02:00
Vincent Breitmoser cd55871950 display unknown keys red rather than orange
For an unknown key, there is no indication of the state the key is in.
To indicate both immediate action required, and to make this status
equal to its worst case (rather than *better* than its worst case), the
status is displayed in red.

At some point, we will probably want to download unknown keys
automatically, at which point an unknown key will actually be an error
state. This is an intermediate solution until then.
2015-04-28 18:22:24 +02:00
Vincent Breitmoser 8717642198 fix "select all" in key list multi-select 2015-04-28 18:22:21 +02:00
Dominik Schürmann 2b6bb57c1c Display development build status 2015-04-28 11:06:54 +02:00
Vincent Breitmoser 91b774d223 prevent crashes in EncryptKeyCompletionView 2015-04-27 19:49:54 +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 8dbb82a8b6 profiling says: caching qrCode bitmaps is a good idea 2015-04-27 13:52:38 +02:00
Daniel Ramos c0fbafde68 -Removed unneeded view references from the fragment class since they are not used outside of createView.
-cleanup
2015-04-26 19:11:51 +01:00
Daniel Ramos 08d25f3685 -removed unneeded code from previous commits. I tested on a KitKat(4.4.2) and Lollipop (5.1) phone and everything seems to be preserved as expected. 2015-04-26 18:56:37 +01: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 9eb98f6eb7 Merge pull request #1225 from vectorijk/SwitchToMaterialDrawer
update lib MaterialDrawer to latest(2.8.2)
2015-04-26 01:38:18 +02:00
Dominik Schürmann 4c74dbe11e UI fixes for Android < 5 2015-04-26 01:28:29 +02:00
Dominik Schürmann 4732bc5744 Remove unused decrypt result layout 2015-04-26 00:36:37 +02:00
vectorijk d0d4149e86 update lib MaterialDrawer to latest(2.8.2) 2015-04-25 15:33:30 -07: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
Manoj Khanna ef52a3319a Espresso test for CreateKeyActivity 2015-04-25 18:44:02 +05:30
Dominik Schürmann 5d6eb2930c Update in-app contributor list 2015-04-25 15:10:15 +02:00
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