grait
e471560e25
progress bar during key creation - minor text change
2014-03-09 14:59:56 +05:30
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
Dominik Schürmann
e4736736b0
Merge pull request #361 from mb-14/file
...
Add option for sharing encrypted file.
2014-03-07 18:37:22 +01:00
Miroojin Bakshi
2e2a9bc967
Add option for sharing encrypted file.
2014-03-07 21:16:58 +05:30
Ashley Hughes
b06e4d827a
uncomment, use Parcel. Builds, not functional
2014-03-07 15:36:01 +00:00
Ashley Hughes
fba0e2af1d
keep up with master
2014-03-07 15:16:13 +00:00
Dominik Schürmann
59067f9f8b
API: get key
2014-03-07 11:24:53 +01:00
Dominik Schürmann
53ba741810
Fix API docs
2014-03-07 11:05:11 +01:00
Dominik Schürmann
a3f17be192
Fix API docs
2014-03-07 10:54:36 +01:00
Ashley Hughes
04fa0e9cc7
use parcel to save keys, but saving existing keys is disabled, pending a rewrite...
2014-03-06 23:47:11 +00:00
Dominik Schürmann
b9a9bbe429
remove icon from nfc dialog
2014-03-06 22:46:04 +01:00
Dominik Schürmann
0cb5d86860
back to Gradle 1.10, Using Gradle 1.11 requires Android Studio 0.5.0 which is not released yet
2014-03-06 22:24:52 +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
9edd4bee70
fix pathes in README
2014-03-06 19:49:54 +01:00
Dominik Schürmann
633cca21a0
remove unused search definitions from manifest
2014-03-06 19:41:07 +01:00
Dominik Schürmann
28e4a75e7e
Merge pull request #354 from uberspot/master
...
Multiselect: Create 'select all' in public and secret keylist
2014-03-06 19:36:31 +01:00
Dominik Schürmann
414623670e
sdk 17 no longer needed
2014-03-06 19:36:37 +01:00
uberspot
1cf912de2b
Multiselect: Create 'select all' in public and secret keylist
2014-03-06 20:32:27 +02:00
Dominik Schürmann
0ed097a020
Merge pull request #353 from Emantor/new_gradle
...
New gradle and gradle plugin Version
2014-03-06 19:32:12 +01:00
