Commit Graph

1630 Commits

Author SHA1 Message Date
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
Emantor
9d542ebf5b Update README 2014-03-06 19:11:11 +01:00
Emantor
3ccb2b65cb Update missing build.gradle files 2014-03-06 19:02:07 +01:00
Emantor
674e24b5d2 Switch from 0.9+ to 0.9.0 2014-03-06 18:23:46 +01:00
Emantor
53c1d95b8b Add new gradle-wrapper.jar 2014-03-06 18:22:19 +01:00
Emantor
1ab663a495 Update gradlewrapper to gradle 1.11 2014-03-06 17:43:33 +01:00
Emantor
8e2d254976 Update to gradle 0.9+ jar 2014-03-06 17:32:00 +01:00
Dominik Schürmann
ea2f3e1444 Merge pull request #350 from uberspot/master
add lock icon for 'Encrypt to..' multiselect option
2014-03-06 14:31:49 +01: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
Ashley Hughes
01951810ae fix saving new key (tmp) 2014-03-06 13:00:17 +00:00
uberspot
d374f0ffbd Add search icon for other dpi 2014-03-06 14:33:04 +02:00
Ashley Hughes
8662ca2928 a method, if not the best one, for each property 2014-03-06 12:25:35 +00: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