grait
7b8668a7e3
Merge branch 'develop' into master2
2014-03-09 14:44:20 +05:30
uberspot
059e57c5d0
Colorize fingerprint
2014-03-09 04:14:23 +02:00
Dominik Schürmann
50d9908baf
Merge pull request #369 from hav3n/branch-fixes
...
Fix for #347
2014-03-09 02:05:23 +01:00
Dominik Schürmann
5b255a263f
Fix key id and fingerprint handling, use full key ids
2014-03-09 01:49:25 +01:00
Nikhil Peter Raj
14b3807811
Revised fix for #347
2014-03-09 01:32:41 +05:30
Dominik Schürmann
8dc7a72331
Merge pull request #316 from danielhass/import-error
...
Show error if file import has no content
2014-03-08 18:27:32 +01:00
Dominik Schürmann
402aeeabf3
use parameter in updateFromKeyserver
2014-03-08 17:19:57 +01:00
Vincent Breitmoser
be558944b5
add contact count to My Keys header
2014-03-08 14:52:29 +01:00
Vincent Breitmoser
de6daf5c30
better handling of multi select in ListKeysFragment
2014-03-08 14:08:44 +01:00
Vincent Breitmoser
16116ba725
ditch old key list activities
2014-03-08 13:42:50 +01:00
Vincent Breitmoser
706e212b6b
add edit button and secret key info to public key view
2014-03-08 13:17:52 +01:00
Vincent Breitmoser
7ad8977cf3
move some placeholders into resources
2014-03-08 12:28:20 +01:00
Vincent Breitmoser
aa8a8f069f
Normalize public key uri in KeyListFragment
...
Find the explicit row id of the public key id given in the uri in
KeyListFragment and work with that. This way, passing in uris by
master key id, mail address, or any other criteria, works.
Might be a good idea to add an actual check if the row id is non-zero
here, but not sure how to do a "bad intent" thing
2014-03-08 12:07:20 +01:00
Vincent Breitmoser
191c5b8130
Make EditKeyActivity's uri handling (more) sane
...
This activity didn't actually use the uri for anything, but just chopped
off the last path segment and interpreted it as row id. What the hell.
2014-03-08 11:58:26 +01:00
Vincent Breitmoser
8c6cb8b0ab
working unified list (no actions yet)
2014-03-08 11:19:34 +01:00
Nikhil Peter Raj
b29c430959
Fix for #347
2014-03-08 15:28:46 +05:30
Dominik Schürmann
db05b3043a
beta4
2014-03-08 00:17:24 +01:00
Dominik Schürmann
0e33fd2392
Split api libs into OpenKeychain specific and OpenPGP Provider lib
2014-03-07 23:05:03 +01:00
grait
3fbda4245c
progress is shown when creating the default key based on number of keys created so far
2014-03-08 03:27:22 +05:30
Dominik Schürmann
2737aedca7
Revert "Fix for #347 "
...
This reverts commit dd80ddd6f9
.
2014-03-07 22:48:20 +01:00
Dominik Schürmann
882333ce05
Merge pull request #366 from uberspot/master
...
Minor code clean up
2014-03-07 22:39:53 +01:00
Dominik Schürmann
7b1e3fef19
Merge pull request #367 from hav3n/branch-fixes
...
Fix for #347
2014-03-07 22:39:20 +01:00
Dominik Schürmann
def9e5a492
Move search view into onCreateView, fixes #365
2014-03-07 22:37:38 +01:00
uberspot
477d06c43a
removed useless semicolons, fixed some parameters in documenation, simplified some conditionals
2014-03-07 22:35:49 +02:00
uberspot
c1c462db4f
move hardcode strings to strings.xml
2014-03-07 22:35:49 +02:00
uberspot
ca851ba21f
remove unused imports and unthrown exceptions
2014-03-07 22:35:49 +02:00
Nikhil Peter Raj
dd80ddd6f9
Fix for #347
2014-03-08 02:04:50 +05:30
Dominik Schürmann
a1be0d302b
move search view from activity to fragment by setting it as a list header, better reusability! Required for service activites
2014-03-07 21:32:24 +01:00
Dominik Schürmann
3572571391
Reworking main KeyListPublicFragment to get progress indicator
2014-03-07 20:58:33 +01:00
Dominik Schürmann
0a0bdad5b5
Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain
2014-03-07 19:50:50 +01:00
Dominik Schürmann
ba61e69a7d
Cleanup code, search with preceeding %
2014-03-07 19:50:36 +01:00
Miroojin Bakshi
2e2a9bc967
Add option for sharing encrypted file.
2014-03-07 21:16:58 +05:30
Dominik Schürmann
59067f9f8b
API: get key
2014-03-07 11:24:53 +01:00
Dominik Schürmann
b9a9bbe429
remove icon from nfc dialog
2014-03-06 22:46:04 +01:00
Dominik Schürmann
3d944483d3
Merge pull request #344 from ankushb92/ankush2
...
#338
2014-03-06 21:59:56 +01:00
Ankush
8e29b82d6d
corrected commit
...
mCurrentPassPhrase, mChangePassPhrase
Minor variable naming Issue #338
2014-03-07 00:43:09 +05:30
Dominik Schürmann
633cca21a0
remove unused search definitions from manifest
2014-03-06 19:41:07 +01:00
uberspot
1cf912de2b
Multiselect: Create 'select all' in public and secret keylist
2014-03-06 20:32:27 +02:00
uberspot
ccbb6f95f4
add lock icon for 'Encrypt to..' multiselect option
2014-03-06 15:27:48 +02:00
Dominik Schürmann
4c6cbd211e
Merge pull request #349 from uberspot/master
...
Add search icon for other dpi
2014-03-06 14:06:08 +01:00
Dominik Schürmann
e8fbf976da
2.3.1 beta3
2014-03-06 14:02:51 +01:00
Dominik Schürmann
4c49bdcccc
Fix documentation and variable naming in API
2014-03-06 14:02:21 +01:00
Dominik Schürmann
036fdc2b38
Fix verify of cleartext signatures with unknown keys
2014-03-06 14:02:06 +01:00
uberspot
d374f0ffbd
Add search icon for other dpi
2014-03-06 14:33:04 +02:00
Dominik Schürmann
a3fd60e7de
Merge pull request #342 from mb-14/search
...
Implement search for KeyListPublicFragment and SelectPublicKeyFragment
2014-03-06 12:47:07 +01:00
Miroojin Bakshi
fab549c2b5
Use selectionArgs parameter to pass mCurquery.
2014-03-06 16:27:35 +05:30
Vincent Breitmoser
4851f7f8fc
copy public keylist as stub for unified keylist
2014-03-06 01:32:18 +01:00
Miroojin Bakshi
7932dd8a81
Implement search for SelectPublicKeyFragment
2014-03-06 03:37:04 +05:30
Miroojin Bakshi
53f6189301
Implement search for KeyListPublicFragment
2014-03-06 02:24:13 +05:30
Miroojin Bakshi
f99b7585fc
Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain into datefix
2014-03-06 01:49:36 +05:30
Dominik Schürmann
9646a3d471
Merge pull request #328 from bhargavgolla/patch-1
...
Issue #234 : Adding a min date not to go below creation date
2014-03-05 21:10:58 +01:00
Miroojin Bakshi
127ab0fd81
Use string from strings.xml
2014-03-06 01:27:35 +05:30
Bhargav Golla
42fc15e66e
Removed log statements as per Dominik's suggestions
2014-03-05 14:46:38 -05:00
Miroojin Bakshi
a7a8f0a78e
Add documentation
2014-03-06 01:13:08 +05:30
Dominik Schürmann
0409700a93
Merge pull request #339 from uberspot/master
...
Put Preferences in subscreen
2014-03-05 20:13:44 +01:00
uberspot
2000959997
Put Preferences in subscreen
2014-03-05 20:46:33 +02:00
Bhargav Golla
92ba91de14
Set min date to one day after Created Date. Works on Honeycomb and above
2014-03-05 12:48:24 -05:00
Daniel Hammann
e482fe18fe
Lint Issue:
...
TypographyEllipsis: Ellipsis string can be replaced with ellipsis character
Replace "..." with ellipsis character (…, …)
... -> …
2014-03-05 17:46:12 +01:00
Daniel Hammann
bc5f2a9305
Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain
2014-03-05 17:05:01 +01:00
Daniel Hammann
bbda6a5b02
updated build.gradle-Files to current Versions of build-tools and SDK.
2014-03-05 14:14:22 +01:00
Bhargav Golla
7a95784074
Adding a min date not to go below creation date
2014-03-04 22:37:56 -05:00
Dominik Schürmann
a1230bbe53
Fix passphrase retrieval
2014-03-05 02:06:44 +01:00
Dominik Schürmann
875adae40c
Code cleaning in PgpDecryptVerify
2014-03-04 23:14:52 +01:00
Dominik Schürmann
61ee811d60
Fix license header of key server files
2014-03-04 22:42:44 +01:00
Dominik Schürmann
a83c18bafb
Remove unused imports
2014-03-04 22:20:59 +01:00
Dominik Schürmann
e1f525a0ac
name KeychainIntentService properly
2014-03-04 22:17:45 +01:00
Dominik Schürmann
9c19394da6
Update from transifex
2014-03-04 22:06:30 +01:00
Dominik Schürmann
fe8044d181
2.3.1 beta2
2014-03-04 20:58:53 +01:00
Dominik Schürmann
06f9134eb1
Enforce private key for applications, verify signed-only texts without passphrase input, better internal decrypt and verify method
2014-03-04 20:53:44 +01:00
Dominik Schürmann
89a4c38cc0
return SIGNATURE_SUCCESS_UNCERTIFIED from service
2014-03-04 15:18:05 +01:00
Miroojin Bakshi
50813ef188
Hide CalendarView in tablets
2014-03-04 19:20:56 +05:30
Miroojin Bakshi
0a12c41ca9
Extend DatePickerDialog and override setTitle() method.
2014-03-04 18:45:06 +05:30
Daniel Haß
106027a7cd
Fixed some naming
2014-03-04 13:58:26 +01:00
Daniel Haß
a12b67c538
Added exception is null option to display nothing if no error occured
2014-03-04 13:56:46 +01:00
Dominik Schürmann
1613a015d6
Merge pull request #322 from mj7007/smooth_activity_switch
...
Smooth Activity Switch Fixed
2014-03-04 10:59:59 +01:00
Dominik Schürmann
07bb421da5
Merge pull request #315 from jessicayuen/master
...
#226 : Added cancel option to ProgressDialogFragments. Create Key is now cancelable.
2014-03-04 10:51:26 +01:00
mj7007
e4461b788f
Smooth Activity Switch Fixed
2014-03-04 13:57:48 +05:30
Jessica Yuen
af6713dc78
#226 : Small fix to prevent message from being sent if IntentService is canceled
2014-03-03 23:04:55 -05:00
Daniel Haß
d691d4c965
Added handling for other exceptions in the ImportListLoader.
2014-03-03 20:42:38 +01:00
Dominik Schürmann
b837579cdc
Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain
2014-03-03 15:46:04 +01:00
Dominik Schürmann
94e161fe0d
change ordering in Intent descriptions for better readability in small dialogs
2014-03-03 15:45:53 +01:00
Daniel Haß
ec8a3469ff
Little fixes
2014-03-03 15:07:07 +01:00
Emantor
ed7485e91d
Fix NewApi Lint Errors
...
Fix missing ;
import android.annotation.TargetApi where needed
2014-03-03 14:21:15 +01:00
Emantor
736eac074d
Fix DefaultLocale Lint Warnings
2014-03-03 11:50:48 +01:00
Emantor
122e562675
Fix ScrollViewSize Lint Warnings
2014-03-03 11:48:45 +01:00
Daniel Haß
6362b2de94
Added FileHasNoContent string
2014-03-03 09:36:40 +01:00
Daniel Haß
f484122c35
Added exception for empty files
2014-03-03 09:36:10 +01:00
Daniel Haß
9843bafafd
Added handler for FileHasNoContent exception, some clean up
2014-03-03 09:35:05 +01:00
Jessica Yuen
e4e3c555e9
#226 : Async key gen task is stopped if progress is canceled
2014-03-02 20:55:13 -05:00
Jessica Yuen
91a2ecb15c
#226 : Activity no longer closes if progress is canceled for key creation in EditKeyActivity
2014-03-02 17:33:21 -05:00
Jessica Yuen
1baae3775e
#226 : Added cancel option to ProgressDialogFragments. Create Key is now cancelable.
2014-03-02 15:08:18 -05:00
Dominik Schürmann
64601fa981
version code 23101 for beta testing
2014-03-02 18:18:55 +01:00
Dominik Schürmann
6ddccb0d6f
version code 23101 for beta testing
2014-03-02 18:15:11 +01:00
Dominik Schürmann
339136dda5
Update from transifex
2014-03-02 18:14:49 +01:00
Dominik Schürmann
4a13f70a88
API changes
2014-03-02 01:20:06 +01:00
Dominik Schürmann
0c60eea628
Merge pull request #306 from danielhass/keyserver-conerror
...
Show error if keyserver is not reachable
2014-02-28 23:27:57 +01:00
Daniel Haß
414839b915
Some clean up
2014-02-28 22:43:31 +01:00
Daniel Haß
7e229d4247
Added different notifys for different exceptions
2014-02-27 22:15:50 +01:00
Daniel Haß
c60ec7a8a7
Added error strings for key import from keyserver
2014-02-27 22:10:07 +01:00
Dominik Schürmann
7bbfd9d446
cleanup
2014-02-27 16:55:42 +01:00