Dominik Schürmann
f22bbbd96c
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-27 13:52:05 +02:00
Dominik Schürmann
1a7edc9925
Dont show keyboard by default in key creation to allow the user to get an overview what to type, use spannable where possible
2014-09-27 13:52:01 +02:00
Vincent Breitmoser
1a2ec1eb32
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-26 00:43:08 +02:00
Vincent Breitmoser
4ccb26d2e5
nfc: use proper hex encoding for pin length
...
Fixes #886
2014-09-26 00:39:48 +02:00
Tim Bray
6d70e1bfd1
Fix bug where Keybase extraData gets lost when SKS wins the search race.
2014-09-25 02:30:52 -07:00
Dominik Schürmann
999094934a
Fixes for new app list
2014-09-24 21:30:03 +02:00
Dominik Schürmann
d5a1e9bb66
3.0 beta1
2014-09-24 19:11:23 +02:00
Vincent Breitmoser
f48db5a005
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-24 15:41:16 +02:00
Vincent Breitmoser
9e2fc81c65
disable pull to refresh (for now)
2014-09-24 15:41:08 +02:00
Dominik Schürmann
8b663add04
Pull from transifex
2014-09-24 15:41:00 +02:00
Vincent Breitmoser
312598290b
fix save button when no file is selected
2014-09-24 15:36:34 +02:00
Vincent Breitmoser
a50fe142e4
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-24 15:31:37 +02:00
Vincent Breitmoser
7c6eff6d92
show message about saving multiple files rather than hide the button
2014-09-24 15:28:51 +02:00
Vincent Breitmoser
689b2c9ab1
move more stuff into EncryptActivity superclass
2014-09-24 15:18:00 +02:00
Vincent Breitmoser
e0da0f6eb5
use correct pin for nfc in EncryptActivity
2014-09-24 15:04:23 +02:00
Dominik Schürmann
9dbb966b44
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-24 14:46:03 +02:00
Dominik Schürmann
e3a185f698
propose apps in apps list
2014-09-24 14:45:51 +02:00
Vincent Breitmoser
c7b0f77c9b
allow 1024 bit key signatures
2014-09-24 14:14:16 +02:00
Vincent Breitmoser
da66d1443f
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-24 12:30:15 +02:00
Vincent Breitmoser
e4a7414794
fix Le fields in APDUs
2014-09-24 12:30:07 +02:00
Dominik Schürmann
5b0cc1fab4
Fix logging in NFcActivity
2014-09-24 11:57:50 +02:00
Vincent Breitmoser
5604deaca0
Fix yubikey pin lengths other than 6
...
Closes #883
2014-09-24 02:58:38 +02:00
Vincent Breitmoser
425cea41f2
add subtle attention seeker to decryptactivity with available clipboard data
...
Thanks Cyril Mottier
https://plus.google.com/+CyrilMottier/posts/FABaJhRMCuy
2014-09-24 02:43:45 +02:00
Dominik Schürmann
382ae968d6
Fix strings reported by yahoe.001
2014-09-24 02:36:24 +02:00
Dominik Schürmann
c3e0b3e887
Fix NfcActivity typo
2014-09-24 02:11:41 +02:00
Dominik Schürmann
b373c866e7
Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate
2014-09-24 02:01:53 +02:00
Dominik Schürmann
f7d49a48cb
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-24 01:49:50 +02:00
Dominik Schürmann
3850ddea08
DecryptFiles: Reset state for new file decrytion
2014-09-24 01:46:54 +02:00
Vincent Breitmoser
c871891f49
Merge remote-tracking branch 'origin/master'
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
2014-09-24 01:42:17 +02:00
Vincent Breitmoser
7654cd54fb
fix signing in OK with yubikeys
2014-09-24 01:41:40 +02:00
Dominik Schürmann
6e0938aa93
Fix new decrypt button
2014-09-24 01:41:38 +02:00
Dominik Schürmann
993046d12e
cleanup
2014-09-24 01:38:18 +02:00
Vincent Breitmoser
d588b13255
fix signatures produced by yubikey
...
The timestamp was only set on a second run. This led to a race
condition whether the signature could be completed within the
same timestamp.
Fixes #834
2014-09-24 01:37:28 +02:00
Dominik Schürmann
42a7cd5eb0
Button text for decrypt
2014-09-24 01:37:00 +02:00
Dominik Schürmann
7f2640711e
Fix yubikey file decryption
2014-09-24 01:18:14 +02:00
Dominik Schürmann
0182f7c951
Yubikey text decryption working
2014-09-24 00:57:57 +02:00
Dominik Schürmann
07704c2726
Yubikey decryption
2014-09-24 00:50:58 +02:00
Dominik Schürmann
7c82e1c728
DecryptFilesActivity
2014-09-24 00:02:00 +02:00
Vincent Breitmoser
07e8729abf
fix nullpointer in previous swipetorefresh fix
2014-09-23 23:49:18 +02:00
Dominik Schürmann
0143b54e9e
Implement buttons in DecryptTextFragment
2014-09-23 23:38:30 +02:00
Dominik Schürmann
b9347ea9aa
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-23 23:04:27 +02:00
Dominik Schürmann
9f67b0fe54
DecryptTextActivity rework
2014-09-23 23:04:18 +02:00
Vincent Breitmoser
ab4972b428
missed a secondary preference initialization
2014-09-23 19:17:54 +02:00
Vincent Breitmoser
5e090e6fb6
fix nullpointer ImportKeysListEntry (from pulltorefresh)
...
Fixes #873
2014-09-23 19:02:08 +02:00
Vincent Breitmoser
45b7b88b94
disable pull to refresh in upper right corner
...
While at the top of the list, the scroll bar handle is in the top right
corner. Previously, dragging the handle from this position was difficult
because touch events were intercepted by the pull to refresh handler.
Closes #858
2014-09-23 18:48:39 +02:00
Vincent Breitmoser
c5239d6e9b
be more precise on importresult overall error
2014-09-23 16:23:13 +02:00
Vincent Breitmoser
da1779816b
take failed keys into account in importkeyresult notification
2014-09-23 16:19:01 +02:00
Vincent Breitmoser
070017b12f
passphrasecache: cache by master key, introduce preference for cache by subkey
2014-09-23 15:56:48 +02:00
Vincent Breitmoser
9d9d71f3db
reject keys with duplicate subkeys altogether
...
closes #870
2014-09-23 01:36:46 +02:00
Vincent Breitmoser
3759d74ac8
add test case for duplicate keys in keyring ( #870 )
2014-09-23 01:32:36 +02:00
Vincent Breitmoser
862c9a8b3c
log "unspecified" flags differently
2014-09-22 17:02:53 +02:00
Vincent Breitmoser
f6ac887ce0
nicer code in key import for flag log types
2014-09-22 16:47:29 +02:00
Vincent Breitmoser
029ce91670
show authenticate flag in logs
2014-09-22 16:27:42 +02:00
Dominik Schürmann
d63fabace7
Hack to fix #805
2014-09-22 00:10:55 +02:00
Dominik Schürmann
fc4cdaa24b
Fix possible nullpointer in ImportKeysFileFragment
2014-09-21 23:25:41 +02:00
Dominik Schürmann
db7da6525e
Fix custom key configuration for primary user ids
2014-09-21 23:19:21 +02:00
Dominik Schürmann
f50c0e1905
Fix LogDisplayFragment
2014-09-21 22:56:16 +02:00
Dominik Schürmann
65c3d69d9a
Fix ConsolidateResult, needed parcelable methods
2014-09-21 22:31:28 +02:00
Dominik Schürmann
1dd68c7120
Merge pull request #871 from timbray/master
...
Handle absence of personal information in Keybase search result
2014-09-21 21:48:13 +02:00
Dominik Schürmann
bf0104af2e
Feature to change key configuration in create key
2014-09-21 21:50:56 +02:00
Tim Bray
edf87d09cb
Handle absence of personal information in Keybase search result
2014-09-21 10:24:48 -07:00
Dominik Schürmann
d4387c0179
Add null check to getSecretKeyType
2014-09-21 18:27:03 +02:00
Dominik Schürmann
1f5f937d00
Small UI fixes
2014-09-21 18:10:51 +02:00
Dominik Schürmann
9bd3383b49
Merge user ids in import list for better display
2014-09-21 17:58:26 +02:00
Dominik Schürmann
1d38365a61
key spinner fixes
2014-09-21 12:03:25 +02:00
Dominik Schürmann
08ad0cb305
settings code cleanup
2014-09-21 11:02:29 +02:00
Dominik Schürmann
b06fe773cf
New key flags icons, subkey adapter redesign, support authanticate flag in database
2014-09-20 20:36:37 +02:00
Dominik Schürmann
da4a70c513
no monospace for key ids
2014-09-20 18:12:13 +02:00
Vincent Breitmoser
6062b5ef68
fix isLocal logic (f*ck yeah unit tests!)
2014-09-20 00:32:50 +02:00
Vincent Breitmoser
344bc1736d
respect user id revocation signatures
...
Closes #836
2014-09-20 00:14:33 +02:00
Vincent Breitmoser
6536ca825b
forgot a LogLevel piece
2014-09-19 21:40:45 +02:00
Dominik Schürmann
1ad36e2dbd
Beautify key id (thanks to Tim Bray)
2014-09-19 13:44:17 +02:00
Dominik Schürmann
99bf77dd84
Remove certificate validation code from ViewCertActivity, they are already validated by import
2014-09-19 11:46:21 +02:00
Dominik Schürmann
a454bfd701
Use key icons in import, prettify items
2014-09-18 22:05:27 +02:00
Dominik Schürmann
a77c217b82
Fixes for nfc decrypt
2014-09-18 15:28:51 +02:00
Dominik Schürmann
1837dc89fa
Fix nfc signing
2014-09-18 14:54:25 +02:00
Dominik Schürmann
4dec8b2b76
Stop refreshing after all keys have been updated
2014-09-18 14:41:24 +02:00
Dominik Schürmann
e019752a28
Swipe-to-refresh fixes
2014-09-18 14:03:21 +02:00
Dominik Schürmann
ac66f6cc10
Swipe-to-refresh fixes
2014-09-18 13:55:23 +02:00
Dominik Schürmann
91e97d03a1
Fix sign via API
2014-09-18 13:19:57 +02:00
Dominik Schürmann
9586d6b9b8
Use key icons in spinners
2014-09-17 23:06:49 +02:00
Dominik Schürmann
b09d222f34
package reordering: merge util and helper, there were no real difference; created ui.util for everything related to formatting
2014-09-17 21:51:25 +02:00
Dominik Schürmann
a139be29ba
PassphraseDialogActivity usage in Remote API
2014-09-17 21:36:38 +02:00
Dominik Schürmann
7d917fa39c
Fix cleartext verify
2014-09-17 21:26:08 +02:00
Dominik Schürmann
1abf167f80
Passphrase handling in encrypt
2014-09-17 20:40:02 +02:00
Dominik Schürmann
8724916866
Result parcel refactorings (WIP)
2014-09-17 15:08:02 +02:00
Vincent Breitmoser
a3e7406b3d
fix encrypt/decrypt classes
2014-09-17 14:32:14 +02:00
Dominik Schürmann
27cc92cbef
Dont copy encrypted file to clipboard (dont know how that code ended up there)
2014-09-17 14:00:11 +02:00
Dominik Schürmann
d686c55a0a
Work on new result handling (WIP)
2014-09-17 13:45:16 +02:00
Tim Bray
018ca6abad
Fix construction of algorithmID in Keybase result lists
2014-09-15 15:11:59 -07:00
Vincent Breitmoser
1f9bbff58d
minor fix for passphrase test
2014-09-15 14:17:39 +02:00
Vincent Breitmoser
e457d4c909
Merge remote-tracking branch 'origin/master'
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
OpenKeychain/src/main/res/values-de/strings.xml
2014-09-15 14:00:17 +02:00
Vincent Breitmoser
9a3a032d99
move LogLevel info into LogType enum
2014-09-15 13:59:21 +02:00
Dominik Schürmann
40751bceb5
Pull from transifex
2014-09-15 10:44:36 +02:00
Dominik Schürmann
943a9c2634
ACCESS_NETWORK_STATE no longer needed
2014-09-15 10:34:04 +02:00
Dominik Schürmann
deddb09c32
Fix build
2014-09-15 10:33:15 +02:00
Dominik Schürmann
67e572cf4f
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-15 10:20:01 +02:00
Dominik Schürmann
53bc417f8f
New decrypt activity design (WIP), saner UTF8 decoding (replacing non-decodable characters)
2014-09-15 10:19:55 +02:00
Tim Bray
d1a26c5748
update for new plural origins on ImportKeyListEntry
2014-09-13 21:55:41 -07:00
Tim Bray
c13ccda658
Keys found on multiple servers are now imported from all of them
2014-09-13 21:43:07 -07:00
Tim Bray
7de86a09bc
Change shuffle to rotate, and when merging ImportKeysList entries, if either side is revoked/expired, the merge reflects that
2014-09-13 21:41:03 -07:00
Tim Bray
e14cf32264
Restore Yubikey setting, lost in fumble-fingered merge
2014-09-13 21:41:03 -07:00
Tim Bray
1c32d1df88
Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs
2014-09-13 21:41:03 -07:00
Vincent Breitmoser
36ef8a9a62
work on OperationResultParcel
2014-09-14 01:14:58 +02:00
Dominik Schürmann
88bbce831c
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-14 00:56:03 +02:00
Vincent Breitmoser
03d103af07
pending results are a type of non-success
2014-09-14 00:55:50 +02:00
Vincent Breitmoser
760b05273c
(forgot a file for previous commit)
2014-09-14 00:43:07 +02:00
Vincent Breitmoser
f0e159a372
add SignEncryptResult parcel (probably break stuff)
2014-09-14 00:33:30 +02:00
Dominik Schürmann
db5d12800c
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-14 00:11:28 +02:00
Dominik Schürmann
179f48a4de
First work on decrypt
2014-09-14 00:11:23 +02:00
Daniel Albert
0625a16cb5
Temporary fix for #848 , fixed pull2refresh bugs
2014-09-13 23:57:54 +02:00
Dominik Schürmann
d5c9021b89
Hack to disable overscroll effect of swipe to update
2014-09-13 23:08:04 +02:00
Dominik Schürmann
efdfd2544d
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-13 22:55:32 +02:00
Dominik Schürmann
c9fee47fb3
Custom actionbar to indicate swipe down effect
2014-09-13 22:55:27 +02:00
Vincent Breitmoser
85d0f5b6d5
add key id to trailing asym data log msg
2014-09-13 22:27:22 +02:00
Vincent Breitmoser
e2675caf23
just skip foreign uid certifications during import for now
...
Related to #836 , fix still pending
2014-09-13 22:16:35 +02:00
Vincent Breitmoser
9475c4d91a
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-13 22:09:12 +02:00
Vincent Breitmoser
ff65733ed3
move IS_REVOKED table prefix to the right places
...
Fixes #849
2014-09-13 22:08:53 +02:00
Dominik Schürmann
bcbf96e61b
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-13 22:02:11 +02:00
Dominik Schürmann
b67b6b7f87
Set literal data format tag to UTF8 when encrypting text
2014-09-13 21:59:47 +02:00
Vincent Breitmoser
3b8c171ecb
very small fix, don't show name on encoding warning
2014-09-13 21:47:04 +02:00
Vincent Breitmoser
8a188a79dc
log warning on bad uid encoding
2014-09-13 21:43:37 +02:00
Vincent Breitmoser
f8677a5f16
Merge branch 'result-parcels'
2014-09-13 21:32:17 +02:00
Vincent Breitmoser
7b08b18d25
some DecryptVerify log refinements
2014-09-13 21:29:29 +02:00
Dominik Schürmann
a1323a1a14
deactivate screenshots in new PassphraseDialogActivity
2014-09-13 21:17:19 +02:00
Vincent Breitmoser
efd9d1626e
add a ton of logging to DecryptVerify
2014-09-13 21:14:06 +02:00
Dominik Schürmann
3bc3bc6d58
More smaller UI fixes
2014-09-13 21:01:47 +02:00
Dominik Schürmann
be4882f5c1
If expired/revoked, disable both encrypt buttons
2014-09-13 20:53:07 +02:00
Dominik Schürmann
143cd2bd13
Test for badly encoded user ids
2014-09-13 20:46:44 +02:00
Dominik Schürmann
a8a1f352a8
Add new PassphraseDialogActivity, a transparent activity that only holds the passphrase dialog
2014-09-13 20:29:08 +02:00
Dominik Schürmann
d73ea5f612
Fix share to encrypt text
2014-09-13 20:07:22 +02:00
Dominik Schürmann
7d41800e57
Use spannable directly instead of html conversion in SubkeysAdapter
2014-09-13 19:49:16 +02:00
Dominik Schürmann
cbed39c38c
Remove unused method in KeyUpdateHelper
2014-09-13 19:35:01 +02:00
Vincent Breitmoser
dbbefe2f41
working version of DecryptVerifyResult
2014-09-13 19:30:10 +02:00
Dominik Schürmann
a41b9f08d0
Merge pull request #843 from da-kid/master
...
Implemented Pull2Refresh
2014-09-13 19:10:54 +02:00
Dominik Schürmann
9e37522bdd
Get certificates by raw user ids, be more liberal about accepted user id encodings
2014-09-13 19:05:53 +02:00
Vincent Breitmoser
4c636a1471
introduce OperationResultParcel for PgpDecryptVerify operations (WIP)
2014-09-13 17:54:10 +02:00
Dominik Schürmann
974dc47d69
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-13 17:30:14 +02:00
Dominik Schürmann
aca9ecdb85
getSignaturesForID can return null, check this
2014-09-13 17:30:07 +02:00
Daniel Albert
a86ec573fa
Removed unnecessary querying of keyservers, reimplemented the ListAwareSwipeRefreshLayout and implemented a pull-lock in case there are no keyservers
2014-09-13 17:02:10 +02:00
Vincent Breitmoser
19252380f1
promote all result parcels to top level classes in their own package
2014-09-13 14:36:23 +02:00
Daniel Albert
fd5e5afc9f
Implemented Pull2Refresh in the KeyListFragment
...
Added KeyUpdateHelper and extended ProviderHelper for better fingerprint collection
Added a class for handling the list in the swipe2refresh layout that prevents scrolling bugs
Added Pull2Refresh to the KeyListFragment
2014-09-12 22:44:45 +02:00
Vincent Breitmoser
40c81c9429
fix key upload after certification (hopefully?)
2014-09-12 11:55:14 +02:00
Vincent Breitmoser
4e834d7833
add ui support for stripping subkeys
2014-09-11 22:50:44 +02:00
Vincent Breitmoser
f744488017
editKey: add support for sripping keys
2014-09-11 22:49:21 +02:00
Vincent Breitmoser
2a6774b221
merge: add support for s2k dummy generation
...
if a public key gets merged into a secret one, and there are new
subkeys, the merge() routine now adds a newly generated, stripped secret
subkey instead.
2014-09-11 22:45:35 +02:00
Dominik Schürmann
51d6ad4394
nullpointer check in KeychainProvider
2014-09-11 13:16:35 +02:00
Dominik Schürmann
6eb715a5d9
nullpointer check in KeychainProvider
2014-09-11 13:13:35 +02:00
Dominik Schürmann
f18a8a20ac
Add newly discussed design decisions for passphrase cache service
2014-09-10 13:40:51 +02:00
Vincent Breitmoser
d61d846b72
add some comments to previous commit
2014-09-10 01:04:13 +02:00
Vincent Breitmoser
7dbb7cf1e1
jury-rig broken sign mechanism
...
Should improve situation on #811
2014-09-09 22:43:14 +02:00
Dominik Schürmann
a925e8b83f
Version 2.9.2
2014-09-09 09:40:59 +02:00
Dominik Schürmann
c40d105574
Changelog 2.9.2
2014-09-09 09:37:46 +02:00
Dominik Schürmann
5593d4cc78
Increase s2k count to 0x90
2014-09-09 09:35:18 +02:00
Dominik Schürmann
7c67f7a715
Consolidate on database upgrade
2014-09-09 09:26:03 +02:00
Dominik Schürmann
eecf4f655b
Unify package name
2014-09-08 22:34:43 +02:00
Dominik Schürmann
1c06dd43cf
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-08 15:12:02 +02:00
Dominik Schürmann
0d40d5999b
Fix changelog versioning
2014-09-08 15:11:54 +02:00
Vincent Breitmoser
ceea2667e8
introduce SingletonResult for... singleton results
2014-09-08 14:50:16 +02:00
Dominik Schürmann
9eed414a77
Dont make portrait a requirement
2014-09-08 14:37:11 +02:00
Vincent Breitmoser
055fb59ec3
Properly handle uneditable key types in EditKeyFragment
...
More specifically, return an OperationResultParcel for stripped and
divert-to-card keys, with an appropriate error message in the log.
part of #828
2014-09-08 14:35:15 +02:00
Dominik Schürmann
38101d1fc7
Version 2.9.1
2014-09-08 14:31:14 +02:00
Dominik Schürmann
980674b322
Pull from transifex
2014-09-08 14:26:10 +02:00
Dominik Schürmann
fcd4be5ba0
Changelog 2.10
2014-09-08 14:22:29 +02:00
Dominik Schürmann
9eb65601c4
Revert changes in DecryptFileFragment
2014-09-08 14:10:45 +02:00
Dominik Schürmann
518d7116e2
Work on Yubikey decryption
2014-09-08 14:04:46 +02:00
Dominik Schürmann
8ab2491645
Make preferences safe across multiple processes
2014-09-08 11:30:31 +02:00
Dominik Schürmann
f4592c8b95
Yubikey: use PIN
2014-09-08 00:40:50 +02:00
Dominik Schürmann
7ccd30b78e
Fix signature timestamp in API
2014-09-08 00:17:13 +02:00
Dominik Schürmann
83af19de20
Prepare Yubikey decryption
2014-09-08 00:01:29 +02:00
Dominik Schürmann
fd7f187364
Fix yubikey for signAndEncrypt via API
2014-09-07 23:19:55 +02:00
Dominik Schürmann
e6e70ec7d9
remove send umltiple from text API
2014-09-07 22:58:00 +02:00
Dominik Schürmann
605e37f089
Dont show key_unavailable on pub keys
2014-09-07 22:06:37 +02:00
Dominik Schürmann
afc20602eb
Fix problems in strings.xml
2014-09-07 21:59:57 +02:00
Dominik Schürmann
bb0d04de82
Fix for user ids in API
2014-09-07 20:09:36 +02:00
Dominik Schürmann
4c2419642b
Remove SelectSecretKey, not used anymore
2014-09-07 19:18:19 +02:00
Dominik Schürmann
6c3f6dc74a
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-07 19:01:28 +02:00
Dominik Schürmann
ef30d842d8
API fixes
2014-09-07 18:59:56 +02:00
Dominik Schürmann
857fc43873
Update and fix Intent API
2014-09-07 18:50:58 +02:00
Vincent Breitmoser
0b091aa642
flag revoked, epired and unavailable keys in selection spinner
2014-09-07 18:49:29 +02:00
Dominik Schürmann
65a0a0e34f
Make Intent API as recommended in http://developer.android.com/guide/components/intents-filters.html
2014-09-07 18:26:43 +02:00
Dominik Schürmann
d172058150
Due to compatiblity switch from SHA512 to SHA256
2014-09-07 17:58:28 +02:00
Dominik Schürmann
c026dac8fc
Remove table layout, use hint text for edit fields
2014-09-07 17:27:25 +02:00
Dominik Schürmann
1f477c8059
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-07 17:09:54 +02:00
Dominik Schürmann
94a47719ae
Put quotes around all strings, should fix transifex consistency problems, also see http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to Escaping apostrophes and quotes)
2014-09-07 17:09:46 +02:00
Vincent Breitmoser
597eb268f4
add error text on bad passphrase
2014-09-07 17:04:13 +02:00
Dominik Schürmann
3ba2e0b0c1
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-07 17:01:07 +02:00
Dominik Schürmann
d1e08f9305
Two buttons to encrypt files and text, some fixes
2014-09-07 17:00:58 +02:00
Vincent Breitmoser
31cc004fe1
make EditKeyFragment work with new PassphraseDialog
2014-09-07 16:55:07 +02:00
Vincent Breitmoser
fd7bdbf54f
add proper async check for correct passphrase to passphrasedialog
2014-09-07 16:54:39 +02:00
Dominik Schürmann
02663de191
Better symmetric encryption layout
2014-09-07 16:14:48 +02:00
Dominik Schürmann
27772d401c
Save account on back press and with notify
2014-09-07 16:10:28 +02:00
Dominik Schürmann
0e83df21cf
More UI rework
2014-09-07 15:30:32 +02:00
Dominik Schürmann
0706005732
Fix width for encrypt to
2014-09-07 11:52:02 +02:00
Dominik Schürmann
0d1c9f7745
Remove file menu items from text activity
2014-09-06 18:06:48 +02:00
Dominik Schürmann
05a29a1f8f
No inception with APG
2014-09-06 18:05:06 +02:00
Dominik Schürmann
cc14119425
Fix AndroidManifest for new encrypt activities
2014-09-06 17:55:19 +02:00
Dominik Schürmann
f2f1a9516d
Share helper
2014-09-06 17:39:00 +02:00
Dominik Schürmann
59f32c4fca
Drawer nav method cleanup
2014-09-06 16:36:58 +02:00
Dominik Schürmann
30978384af
Remove unused gmail clearup method
2014-09-06 16:28:31 +02:00