Dominik Schürmann
ff42dfc9db
Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED instead of EXPIRY where possible
2015-03-04 15:02:51 +01:00
Dominik Schürmann
b10fe01b82
Fix status bar orange
2015-03-04 11:46:31 +01:00
Dominik Schürmann
9b565f1875
More simplification of delete strings
2015-03-04 11:44:37 +01:00
Dominik Schürmann
8e12e93bc0
Merge pull request #1097 from ishan1604/orange-toolbar
...
Orange toolbar for certify and fingerprint activity added
2015-03-04 11:40:37 +01:00
Dominik Schürmann
71db34ed75
Simplify certify strings
2015-03-04 11:40:12 +01:00
Dominik Schürmann
aba6569dd2
Simplify dialogs according to Material Design
2015-03-04 11:36:26 +01:00
Ishan Khanna
0362dc6c1d
Orange Toolbar Added Fixes #1088
2015-03-04 15:47:44 +05:30
Vincent
c17599f13f
Merge pull request #1080 from indrora/avoid-large-log-parcels
...
Fix root cause of #1077
2015-03-04 00:43:48 +01:00
Dominik Schürmann
9d23b19458
Merge branch 'vectorijk-development' into development
2015-03-03 23:55:19 +01:00
Dominik Schürmann
1cc860d23f
Merge branch 'development' of https://github.com/vectorijk/open-keychain into vectorijk-development
2015-03-03 23:46:20 +01:00
Dominik Schürmann
c00a1f1ec3
Show name only in passphrase dialog
2015-03-03 23:43:25 +01:00
Dominik Schürmann
b6e30e0bb2
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-03-03 22:44:37 +01:00
Dominik Schürmann
7b0e067f63
Fix expiry dialog, reorder layouts
2015-03-03 22:44:32 +01:00
Dominik Schürmann
188559bbcd
Prettify passphrase dialog, it no longer resizes on unlocking the key
2015-03-03 22:27:14 +01:00
Ishan Khanna
eedc7064b9
Fixes Issue#1088
2015-03-04 02:36:33 +05:30
Ishan Khanna
3dda761791
Merge remote-tracking branch 'upstream/development' into development
...
Conflicts:
.gitmodules
2015-03-04 02:31:39 +05:30
Dominik Schürmann
568854f6dd
Merge pull request #1089 from ishan1604/submodulesfix
...
Submodulesfix
2015-03-03 21:54:58 +01:00
Ishan Khanna
f3fd3c464c
Merge remote-tracking branch 'upstream/development' into development
2015-03-04 02:20:08 +05:30
Ishan Khanna
f5b877ca22
Fixed Submodules
2015-03-04 02:19:59 +05:30
jiangkai
57dca38374
if needed change name options.templ.json
2015-03-03 12:30:56 -08:00
jiangkai
f195055107
icon name changes in UI files
2015-03-03 12:19:00 -08:00
jiangkai
f186199017
delete holo icons
2015-03-03 12:17:11 -08:00
Ishan Khanna
32d934808b
Fixed Spacing issue
2015-03-04 01:39:02 +05:30
Ishan Khanna
89ebb985fb
This edit prevents some modules from throwing untracked content warning in git
2015-03-04 01:31:38 +05:30
jiangkai
6c0a5c04e7
change icon name in layout files
2015-03-03 11:26:59 -08:00
Dominik Schürmann
5a4fc0a071
Fix toolbar margins on Android lower 5
2015-03-03 20:15:09 +01:00
jiangkai
ba1cd87d39
download new material design icons
2015-03-03 10:36:38 -08:00
jiangkai
ce37b7255d
get more material icon script
2015-03-03 10:09:04 -08:00
Dominik Schürmann
be06c4cd58
Use spinner DatePicker, not full calendar, also on Android 5
2015-03-03 19:04:40 +01:00
Morgan Gangwere
ba5eb3543e
Cleanup for style
...
Some nitpicks were had. Also, change the null UUID to a constant.
2015-03-03 08:47:16 -07:00
Dominik Schürmann
5da57f0582
Update patternview lib, remove workaround
2015-03-03 15:56:03 +01:00
Dominik Schürmann
2ea0f609f2
Remove old min sdk check
2015-03-03 13:16:56 +01:00
Dominik Schürmann
199ff610e0
Merge pull request #1082 from ishan1604/bug-1081
...
Fixes Issue #1081
2015-03-03 11:21:28 +01:00
Ishan Khanna
06d76ccd0c
Fixes Issue #1081
...
The App crashed because the Adapter was trying to call a method on a
null object.
Where was the null object?
CheckBox was null because in the Layout file
view_key_adv_user_id_item.xml
There is no such widget with id = user_id_item_check_box
Fix :
I removed the two lines which were causing the bug, and now the screen
loads perfectly.
2015-03-03 14:46:28 +05:30
Morgan Gangwere
73a1ceb732
Fix root cause of #1077
...
When importing lots of keys, lots of messages about the status of keys
is generated, including some debug slime and general fluff that
isn't really needed a lot of the time. As a result, a serious bug can come
along after key imports or certain operations which cause a log to become
parceled.
This commit implements a pool to "dehydrate" logs into: they are placed
into the pool (a ConcurrentHashMap) and a UUID assigned to them, which
is parceled along. When the OperationResult is un-parceled, it reads in
the appropriate UUID bits and rehydrates the appropriate log.
In order to avoid any memory leaks, the log pool removes a reference to
the log itself, allowing the log to die a natural death at the hands
of the GC..
2015-03-03 00:51:44 -07:00
Dominik Schürmann
1a12eb1a7a
Cleanup settings.gradle
2015-03-03 00:27:33 +01:00
Dominik Schürmann
d3f54d3ace
Revert "rescale qr code bitmap in background"
...
size of view may not be available in background thread.
This reverts commit 7e4c39c79d
2015-03-03 00:26:36 +01:00
Dominik Schürmann
363d41ed1d
Cleanup of contact sync, debugging
2015-03-03 00:26:15 +01:00
Dominik Schürmann
ea24b5169e
Reorder build.gradle
2015-03-02 18:50:38 +01:00
Vincent Breitmoser
7e4c39c79d
rescale qr code bitmap in background
2015-03-02 18:44:24 +01:00
Dominik Schürmann
05ef61afd5
Update API lib
2015-03-02 18:21:10 +01:00
Vincent Breitmoser
145e793db1
forgot to rename a method
2015-03-02 18:20:02 +01:00
Vincent Breitmoser
bccdae2a40
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-03-02 18:09:09 +01:00
Vincent Breitmoser
23464e7a89
some cleanup in ViewKey*
2015-03-02 18:09:00 +01:00
Dominik Schürmann
7127c2205e
README: mac os x workaround
2015-03-02 17:54:59 +01:00
Vincent Breitmoser
817afffecc
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-03-02 17:44:50 +01:00
Vincent Breitmoser
1f828528d3
don't reload qr code for identical fingerprint
2015-03-02 17:43:42 +01:00
Dominik Schürmann
dae0873f5e
Search string simplified
2015-03-02 17:39:30 +01:00
Vincent Breitmoser
0846dd2c14
make userattributeadapter superclass of useridsadapter
2015-03-02 17:38:05 +01:00
Dominik Schürmann
3c7c278ef3
Use gradle witness
2015-03-02 17:23:06 +01:00
