Vincent Breitmoser
67093ccba2
forgot to commit FabContainer
2015-02-28 00:40:11 +01:00
Dominik Schürmann
fd55cdb08e
Merge branch 'development' of github.com:open-keychain/open-keychain into development
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
2015-02-28 00:39:18 +01:00
Dominik Schürmann
453b67f7a8
Update from transifex
2015-02-28 00:38:53 +01:00
Vincent Breitmoser
9c62c3fd39
control flow for moving the fab up with snackbar
2015-02-28 00:28:20 +01:00
Dominik Schürmann
0669193e75
Simplify MainActivity
2015-02-28 00:22:31 +01:00
Dominik Schürmann
1c91be84af
Upload new keys to keyserver by default
2015-02-28 00:11:34 +01:00
Dominik Schürmann
0b49becaa8
padding fixes for key list
2015-02-28 00:04:15 +01:00
Dominik Schürmann
dc38031b4e
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-02-27 23:57:00 +01:00
Dominik Schürmann
582caaba97
Reorder advanced key view
2015-02-27 23:56:53 +01:00
Vincent Breitmoser
c46fdef203
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-02-27 23:53:14 +01:00
Vincent Breitmoser
8cfba4c0fb
slightly longer color fade duration
2015-02-27 23:52:51 +01:00
Dominik Schürmann
f2a9a41840
Enable multi line snackbar option
2015-02-27 23:47:15 +01:00
Dominik Schürmann
200d4a6bb6
Remove swipte to refresh src, fix padding in key list
2015-02-27 23:39:36 +01:00
Dominik Schürmann
b1c8fa3471
Fix keyboard overlay bug on top of edittexts
2015-02-27 23:24:04 +01:00
Vincent Breitmoser
aec9bdfc1e
transition status color in key view
2015-02-27 23:10:02 +01:00
Vincent Breitmoser
863f4e6ac1
hand through result in CertifyFingerprintActivity
2015-02-27 23:09:17 +01:00
Dominik Schürmann
5b1d834f91
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-02-27 22:47:43 +01:00
Dominik Schürmann
fd2f858b12
Fix status images in user id adapter
2015-02-27 22:47:39 +01:00
Vincent Breitmoser
80c159056d
show refresh key progress inline
2015-02-27 22:46:48 +01:00
Dominik Schürmann
fe31883f66
Keybase header text
2015-02-27 22:40:52 +01:00
Dominik Schürmann
54e04f496e
Better qr code resizing
2015-02-27 22:26:11 +01:00
Adithya Abraham Philip
23cbd786ea
cleaned up log export
2015-02-28 02:11:39 +05:30
Adithya Abraham Philip
960a163185
Merge branch 'development' of https://github.com/open-keychain/open-keychain into development
2015-02-28 01:30:41 +05:30
Adithya Abraham Philip
d776bd2888
refined log output
2015-02-28 01:30:17 +05:30
Vincent Breitmoser
2cd7be6373
go to directly to certify screen after nfc import
2015-02-27 18:05:36 +01:00
Dominik Schürmann
ea4ca9e686
Prettify qr code cleanup
2015-02-27 01:47:06 +01:00
Dominik Schürmann
11c3436454
Prettify qr code in advanced key view
2015-02-27 01:44:40 +01:00
Dominik Schürmann
4ccd9f9bb1
Uncluttering advanced key view
2015-02-27 01:38:57 +01:00
Dominik Schürmann
b90335f901
Simplify delete key dialog
2015-02-27 01:30:32 +01:00
Dominik Schürmann
8230fb1179
Remove unused BadImportKeyDialogFragment
2015-02-27 01:26:26 +01:00
Dominik Schürmann
6bd4e1e5b3
Fix margins of dialog views
2015-02-27 01:26:04 +01:00
Dominik Schürmann
6dce7c88d8
Merge keybase-proof branch
2015-02-27 01:18:18 +01:00
Vincent Breitmoser
4ff8eca292
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-02-26 18:54:00 +01:00
Vincent Breitmoser
55dd6526a6
split up and mark unsafe expiry-related methods
2015-02-26 18:53:42 +01:00
Vincent Breitmoser
e5bb7a35b5
save revocation instead of self-cert for revoked uids
2015-02-26 18:53:16 +01:00
Vincent Breitmoser
d7888d4666
ignore revoked user ids for primary key expiry
2015-02-26 18:52:54 +01:00
Adithya Abraham Philip
99ff9d2340
merged dialog
2015-02-26 22:26:40 +05:30
Dominik Schürmann
1210a80a96
Remove old Holo design resources
2015-02-26 17:37:28 +01:00
Dominik Schürmann
93109985e7
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-02-26 17:32:28 +01:00
Dominik Schürmann
4c4782bd5e
Hopefully fixes drop down icon for spinners on Android lower 5
2015-02-26 17:32:08 +01:00
Adithya Abraham Philip
ec353b0c39
initial Log Display function
2015-02-26 21:58:25 +05:30
Vincent Breitmoser
ad8209bd94
pre-select certification key if only one is available
2015-02-26 10:48:17 +01:00
Dominik Schürmann
72acaaa41f
Fingerprint verification, design fixes for qr code card
2015-02-26 02:06:57 +01:00
Dominik Schürmann
a38f84a401
Dont show verification icons in my key view, hide edit button for non-secret keys
2015-02-25 21:53:46 +01:00
Dominik Schürmann
b521162ef0
Invoke NFC button
2015-02-25 20:50:34 +01:00
Dominik Schürmann
0931c7742b
Other icon for key exchange
2015-02-25 20:20:39 +01:00
Dominik Schürmann
57fa702cbf
Design fixes for header, QR Code shared element transitions
2015-02-25 19:38:13 +01:00
Dominik Schürmann
27263edda5
CardView and more header design
2015-02-25 18:37:31 +01:00
Dominik Schürmann
4ea59f79cc
Use material icon for safeslinger
2015-02-25 15:18:00 +01:00
Dominik Schürmann
8ddca4f8fe
Fix menu
2015-02-25 13:49:54 +01:00
Dominik Schürmann
fa92ceeae3
Toolbar: qr code in header, cleanup of fragment
2015-02-25 13:49:21 +01:00
Dominik Schürmann
430ba2f777
Bigger status icon in key view
2015-02-25 11:29:46 +01:00
Dominik Schürmann
56d38dd68b
First work on new key view toolbar
2015-02-25 02:35:09 +01:00
Dominik Schürmann
2b609b8144
Fix QR Code, design experiments for key view
2015-02-24 13:43:24 +01:00
Dominik Schürmann
17a6003edd
Remove tabs in view key
2015-02-24 11:25:19 +01:00
Dominik Schürmann
52bcfd71ad
New advanced key view
2015-02-23 23:03:45 +01:00
Dominik Schürmann
29628e54ec
Refactor AppsListFragment
2015-02-23 21:55:44 +01:00
Dominik Schürmann
2064d81aef
Refactor AppsListFragment
2015-02-23 21:52:04 +01:00
Dominik Schürmann
dd3af50956
Uncluttering App Settings: Move advanced info in dialog
2015-02-23 10:36:39 +01:00
Dominik Schürmann
4c7622e257
Remove unused FixedDrawerLayout
2015-02-23 00:30:02 +01:00
Dominik Schürmann
7bddd5be1d
Remove old pattern lib, add new pattern lib
2015-02-23 00:28:26 +01:00
Dominik Schürmann
6b57afc350
Removed submodule android-lockpattern
2015-02-23 00:17:27 +01:00
Dominik Schürmann
4e8c4af262
Update tab lib and fix colors of tabs
2015-02-23 00:11:06 +01:00
Dominik Schürmann
d984f50cb7
Disable default yubikey PIN by default
2015-02-22 23:55:23 +01:00
Dominik Schürmann
e20c6add43
Fix multi select and more colors
2015-02-22 23:52:29 +01:00
Dominik Schürmann
f852cb7449
Pull from transifex
2015-02-22 21:41:29 +01:00
Dominik Schürmann
df7009669b
Pull from transifex
2015-02-22 21:39:34 +01:00
Dominik Schürmann
21e7102e3a
Fix back button in encrypt activities
2015-02-22 21:39:20 +01:00
Dominik Schürmann
0cdd68e763
Color for holo
2015-02-22 21:30:27 +01:00
Dominik Schürmann
e583edf020
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-02-22 21:30:02 +01:00
Dominik Schürmann
e46fa777ab
Use right colors in snackbars and logs
2015-02-22 21:28:57 +01:00
Dominik Schürmann
04740121a5
Go to keyserver settings directly
2015-02-22 21:22:25 +01:00
Dominik Schürmann
d0be3bd7ea
Once again: Colors and header image
2015-02-22 21:16:40 +01:00
Dominik Schürmann
7e0e16b014
Merge pull request #1047 from steelman/dev-strings
...
Some Polish translated strings and some tiny cleanups
2015-02-22 10:15:28 +01:00
Łukasz Stelmach
d720ac6124
some Polish translations
2015-02-21 23:06:20 +01:00
Łukasz Stelmach
db8ee77d56
move a string in the safe slinger activity to resources
2015-02-21 22:29:09 +01:00
Dominik Schürmann
6008b65bbd
show app name instead of keys in main list
2015-02-21 21:04:26 +01:00
Dominik Schürmann
32acd94698
Floating action button icons and methods for key list
2015-02-21 20:46:37 +01:00
Dominik Schürmann
5b75985f95
Status bar height fix
2015-02-21 20:01:19 +01:00
Dominik Schürmann
5b017dbf7a
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-02-20 11:04:18 +01:00
Dominik Schürmann
9d7e05c06e
Screenshot for GSoC
2015-02-20 11:04:07 +01:00
Vincent Breitmoser
bb30cb5401
fix comments and some warnings in PgpDecryptVerify
2015-02-17 18:43:43 +01:00
Vincent Breitmoser
3efaac2175
determine correct filesize during decryption from LiteralData packet
2015-02-17 18:08:45 +01:00
Dominik Schürmann
a468c667bb
Improve nav drawer drawable
2015-02-03 19:47:50 +01:00
Dominik Schürmann
e2cb1a90cd
Improve nav drawer drawable
2015-02-03 19:26:40 +01:00
Dominik Schürmann
e29ea517da
Fix first time wizard design
2015-02-03 19:13:02 +01:00
Dominik Schürmann
dfe92ceb24
Add FAB to key list
2015-02-03 18:51:58 +01:00
Dominik Schürmann
d6d679997b
Move encrypt decrypt operations in own starter activity
2015-02-03 18:39:07 +01:00
Dominik Schürmann
9e011860c4
More toolbar fixes
2015-02-03 18:10:13 +01:00
Dominik Schürmann
b77bbb6027
App settings statusbar fix
2015-02-03 16:10:54 +01:00
Dominik Schürmann
7914aa5c08
Toolbar fixes, Toolbar under status bar on Lollipop
2015-02-03 16:05:18 +01:00
Dominik Schürmann
e2a8819385
Floating Action Button added in app settings
2015-02-03 14:28:54 +01:00
Dominik Schürmann
c763ea3503
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-02-02 17:19:31 +01:00
Dominik Schürmann
95e534e1f5
UI experiments for app settings
2015-02-02 17:19:27 +01:00
Vincent Breitmoser
7b24ee7b55
rewrite PgpSignEncrypt data flow
...
- introduce high-level SignEncryptOperation for uri to uri signing/encryption
- use SignEncryptParcel for high-level operation parameters
- use PgpSignEncryptInput plus streams for low-level operation parameters
- get rid of all sign/encrypt logic in KeychainIntentService
2015-02-01 23:14:26 +01:00
Vincent Breitmoser
0b6dc65c97
Merge remote-tracking branch 'origin/development' into development
2015-01-31 18:49:54 +01:00
Vincent Breitmoser
5466d1e980
prevent recursive consolidate
2015-01-31 18:49:00 +01:00
Dominik Schürmann
e651a39279
Rename app setting classes for consistency
2015-01-30 10:59:57 +01:00
Dominik Schürmann
464f7c6718
Fix saving of allowed keys
2015-01-30 10:47:40 +01:00
Dominik Schürmann
34b664f4b6
Merge branch 'ligi/fix/add_ability_to_compile_with_java8' of https://github.com/ligi/open-keychain into ligi-ligi/fix/add_ability_to_compile_with_java8
2015-01-30 10:10:13 +01:00
Dominik Schürmann
38f7950d90
Saving of allowed keys
2015-01-29 21:00:58 +01:00
ligi
fcd91d881e
Add explicit casting to be able to compile with java8
2015-01-29 20:30:26 +01:00
ligi
4aa6e37ac6
Use latest buildTools
2015-01-29 20:28:58 +01:00
Dominik Schürmann
d6e4936fa5
Introduce allowed keys table per API client
2015-01-29 17:46:27 +01:00
Dominik Schürmann
e0369a2f14
Header image tryout
2015-01-29 17:02:01 +01:00
Dominik Schürmann
34b01e9f2b
Remove files related to old nav drawer
2015-01-29 13:36:38 +01:00
Dominik Schürmann
6a7d332606
Fix item layout in apps list
2015-01-29 13:24:08 +01:00
Dominik Schürmann
a346b58db7
Close FileDescriptors and input, output streams when possible
2015-01-29 12:44:06 +01:00
Dominik Schürmann
c4ef86b38a
Refactor DecryptActivity into DecryptOverviewFragment for nav drawer
2015-01-29 12:03:00 +01:00
Dominik Schürmann
03a01dc7ae
White popup theme
2015-01-29 11:03:19 +01:00
Dominik Schürmann
43930ed8f2
Move key list logic into fragment, UI fixes for nav drawer
2015-01-29 10:10:07 +01:00
Dominik Schürmann
5564f65a69
Merge remote-tracking branch 'origin/t/snackbar' into development
...
Conflicts:
OpenKeychain/build.gradle
2015-01-29 09:55:09 +01:00
Dominik Schürmann
81d4d31fd7
Cloud search icon
2015-01-28 18:11:08 +01:00
Dominik Schürmann
6c6201f129
Fix cleartext signatures internally
2015-01-27 17:13:54 +01:00
Dominik Schürmann
5a1187b781
Fix nullpointer in ImportKeysActivity
2015-01-27 13:15:24 +01:00
Dominik Schürmann
ae7ba2639f
Support verification of detached signatures
2015-01-27 13:00:28 +01:00
Dominik Schürmann
e8780b4410
Merge branch 'development' into detached-sigs-api
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
2015-01-27 09:46:42 +01:00
Dominik Schürmann
e77f9a5351
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-01-27 09:43:45 +01:00
Dominik Schürmann
fd29d27e61
Temporary nav drawer fixes
2015-01-27 09:37:07 +01:00
Vincent Breitmoser
6c80025ead
backend support for charset in ascii-armored streams
2015-01-27 09:17:23 +01:00
Dominik Schürmann
fc786280fd
Fixes for detached signatures
2015-01-26 17:33:40 +01:00
Vincent Breitmoser
efe5c80b1c
remove unused NonPgpPartException
2015-01-26 16:33:10 +01:00
Vincent Breitmoser
2bb7c3bcef
move last parts of import logic from kis into operation
2015-01-26 16:33:10 +01:00
Dominik Schürmann
34a7728cec
Merge branch 'development' into detached-sigs-api
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
2015-01-26 16:30:21 +01:00
Dominik Schürmann
e049895b9f
Material Design Drawer
2015-01-26 15:24:42 +01:00
Dominik Schürmann
e4e2d647c8
Material Design: Full screen dialogs
2015-01-26 00:50:35 +01:00
Vincent Breitmoser
b4781343d9
specify our usage of java 1.7 in build files
2015-01-25 12:41:03 +01:00
Vincent Breitmoser
8d9c3c0534
lift language level to java 7, and some code cleanup
2015-01-25 12:36:00 +01:00
Vincent Breitmoser
41aba69fad
introduce PromoteKeyOperation to create dummy secret from public keys
2015-01-25 02:08:07 +01:00
Vincent Breitmoser
1516f951b7
work on divert-to-key and other keyring stuff
...
- allow modifySecretKeyRing operation without passphrase, but a only
restricted subset of operations (ie, s2k strip/divert)
- pass byte array with serial number to key edit operation to initialize
divert-to-card key
- update spongycastle to support serial numbers in iv for divert-to-card
2015-01-25 01:57:58 +01:00
Vincent Breitmoser
fb2fa195bf
allow explicit re-certification in SaveKeyringParcel
2015-01-24 23:11:54 +01:00
Vincent Breitmoser
0e0970c347
move key stripping into ChangeSubkey, support divert-to-card
2015-01-24 23:05:50 +01:00
Vincent Breitmoser
a65edcdb2f
only respect most recent signature for key flags
2015-01-19 18:31:57 +01:00
Vincent Breitmoser
e71bd3d9dd
always show revoked user ids last!
2015-01-19 18:31:57 +01:00
Dominik Schürmann
3752cdd132
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-01-19 17:25:36 +01:00
Dominik Schürmann
3ac466c9db
Disable sharing chooser blacklisting for lollipop
2015-01-19 17:22:31 +01:00
Vincent Breitmoser
198ddfeff7
use Notify helper everywhere, replace supertoasts with snackbar library
2015-01-19 15:43:35 +01:00
Vincent
491c12d5d3
No setContentView in onCreate for KeyListActivity
2015-01-16 15:41:43 +01:00
Vincent Breitmoser
b6f0fb91da
show notification if KeyListActivity is spawned with an EXTRA_RESULT
...
Closes #1029
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
2015-01-16 13:58:34 +01:00
Dominik Schürmann
09e992081b
Style tabs, add missing drawables
2015-01-15 14:48:13 +01:00
Dominik Schürmann
0c74cc7c3d
Fix drawable sizes
2015-01-14 20:25:28 +01:00
Dominik Schürmann
fe25a68c6a
Yubikey numkey by default to true
2015-01-14 20:19:56 +01:00
Dominik Schürmann
1516ebf26a
Toolbar for settings
2015-01-14 20:18:03 +01:00
Dominik Schürmann
85b6669625
Integrate QR Code library instead of requiring the app to be installed, also due to security reasons
2015-01-14 19:14:30 +01:00
Dominik Schürmann
9b093c6d73
Increase minSdk to 15, according to stats
2015-01-14 18:59:18 +01:00
Dominik Schürmann
4ad3c24126
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-01-14 14:52:29 +01:00
Dominik Schürmann
f397d4f995
Reorganize folders of graphics sources
2015-01-14 14:52:23 +01:00
Vincent Breitmoser
8ef104281b
fix ambiguous column name in advanced key info
2015-01-14 14:12:49 +01:00
Dominik Schürmann
b4edb88f45
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-01-14 14:02:58 +01:00
Dominik Schürmann
c94ef60c5d
Fix SearchView
2015-01-14 14:02:51 +01:00
