open-keychain

PeterCxy/open-keychain

Fork 0

Commit graph

7a8db90425 join cert info into query routines Vincent Breitmoser 2014-03-11 00:14:04 +01:00
ba7613dc34 experimental cert import Vincent Breitmoser 2014-03-11 00:13:03 +01:00
77ebfd0875 Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain Daniel Hammann 2014-03-11 00:12:45 +01:00
74f8ec0365 certs: close in from both sides :) Vincent Breitmoser 2014-03-11 00:11:27 +01:00
535f2caf2c (preliminary) certs table Vincent Breitmoser 2014-03-11 00:09:11 +01:00
506782b689 OnFocusChangeListener replaced with OnActionExpandListener For same behaviour like contacts app #386 #387 Daniel Hammann 2014-03-11 00:07:53 +01:00
3f5de1eac6 Merge pull request #390 from uberspot/master Dominik Schürmann 2014-03-10 23:48:53 +01:00
3cad8b6248 Appropriate save Icon in EditKeyActivity uberspot 2014-03-11 00:42:03 +02:00
612ad9e6b3 Merge pull request #383 from sreeram-boyapati/master Dominik Schürmann 2014-03-10 23:20:07 +01:00
8fa62161df More fixes for KeychainIntentServiceHandler Dominik Schürmann 2014-03-10 22:46:30 +01:00
d339029ab9 Pull from transifex Dominik Schürmann 2014-03-10 22:40:59 +01:00
59091e417f getString before init of KeychainIntentHandler Dominik Schürmann 2014-03-10 22:37:13 +01:00
bac68c4c73 Fix progress_generating and reformat Dominik Schürmann 2014-03-10 22:22:37 +01:00
be41a0a3e1 Fix progress_generating and reformat Dominik Schürmann 2014-03-10 22:19:43 +01:00
6fab8a126a Reset cursor query when closing search view #386 Without focus the search result get erased. Daniel Hammann 2014-03-10 20:58:15 +01:00
b90e680ff9 Lint changes after testing Bhargav Golla 2014-03-10 14:59:15 -04:00
da83c8ff60 @color/white instead of hex Dominik Schürmann 2014-03-10 18:26:52 +01:00
d91e2673d7 Revert "Lint changes" Dominik Schürmann 2014-03-10 18:23:47 +01:00
ef8eb3f8b5 Merge pull request #381 from bhargavgolla/Lint-error-fix Dominik Schürmann 2014-03-10 18:11:37 +01:00
a41ee31b6c Added string reference for Issue #207 Sreeram Boyapati 2014-03-10 22:37:23 +05:30
83c346fec4 Make code more tidy for multiselect Dominik Schürmann 2014-03-10 17:49:30 +01:00
e00436b409 Lint changes Bhargav Golla 2014-03-07 18:21:16 -05:00
caa0740919 Improve hightlight query code: make cursor abstract, tidy up code Dominik Schürmann 2014-03-10 17:22:19 +01:00
70d1e01a2b Merge pull request #384 from mb-14/search1 Dominik Schürmann 2014-03-10 17:05:09 +01:00
2166d66680 Cleanup ImportKeysListEntry Dominik Schürmann 2014-03-10 17:06:11 +01:00
6a8fa61908 remove double definition of progress_generating Dominik Schürmann 2014-03-10 16:58:58 +01:00
b8261d7319 Merge remote-tracking branch 'upstream/master' into search1 Miroojin Bakshi 2014-03-10 21:11:14 +05:30
98da2d0c48 Create custom HighlightQueryCursorAdapter Miroojin Bakshi 2014-03-10 21:10:04 +05:30
3372cfacb6 Merge pull request #385 from tharinduwijewardane/master Dominik Schürmann 2014-03-10 16:02:58 +01:00
2b4b09d13c Issue #378 ( private keys are no longer red ): Fixed Tharindu Wijewardane 2014-03-10 17:10:16 +05:30
b927c0f26a Highlight search query in SelectPublicKeyFragment and KeyListPublicFragment Miroojin Bakshi 2014-03-10 15:25:09 +05:30
b47f291d12 ViewHolder Pattern Implemented Sreeram Boyapati 2014-03-10 11:49:18 +05:30
7d2c3f860e Fix to passphrase dialog and Issue #207 Sreeram Boyapati 2014-03-10 08:31:53 +05:30
8d85aa5876 remove unneeded replace for newline on fingerprint Dominik Schürmann 2014-03-09 23:51:18 +01:00
a8add47238 Merge pull request #380 from uberspot/master Dominik Schürmann 2014-03-09 23:48:51 +01:00
dd28303dc1 Merge pull request #368 from ajit766/master Dominik Schürmann 2014-03-09 23:39:53 +01:00
9a7a7f2b01 Merge pull request #372 from rafaelav/master Dominik Schürmann 2014-03-09 23:18:50 +01:00
b107766f5b Issue #178 - Hide advanced options in EncryptActivity rafaelav 2014-03-08 12:28:28 +01:00
4874ea567a progress bar while key creation - added plurals based on no.of keys while key creation grait 2014-03-09 17:45:58 +05:30
e471560e25 progress bar during key creation - minor text change grait 2014-03-09 14:59:56 +05:30
7b8668a7e3 Merge branch 'develop' into master2 grait 2014-03-09 14:44:20 +05:30
059e57c5d0 Colorize fingerprint uberspot 2014-03-09 04:09:00 +02:00
50d9908baf Merge pull request #369 from hav3n/branch-fixes Dominik Schürmann 2014-03-09 02:05:23 +01:00
5b255a263f Fix key id and fingerprint handling, use full key ids Dominik Schürmann 2014-03-09 01:49:25 +01:00
14b3807811 Revised fix for #347 Nikhil Peter Raj 2014-03-09 01:32:41 +05:30
8dc7a72331 Merge pull request #316 from danielhass/import-error Dominik Schürmann 2014-03-08 18:27:32 +01:00
402aeeabf3 use parameter in updateFromKeyserver Dominik Schürmann 2014-03-08 17:19:57 +01:00
be558944b5 add contact count to My Keys header Vincent Breitmoser 2014-03-08 14:41:25 +01:00
de6daf5c30 better handling of multi select in ListKeysFragment Vincent Breitmoser 2014-03-08 14:08:44 +01:00
16116ba725 ditch old key list activities Vincent Breitmoser 2014-03-08 13:42:50 +01:00
706e212b6b add edit button and secret key info to public key view Vincent Breitmoser 2014-03-08 13:17:52 +01:00
7ad8977cf3 move some placeholders into resources Vincent Breitmoser 2014-03-08 12:28:20 +01:00
aa8a8f069f Normalize public key uri in KeyListFragment Vincent Breitmoser 2014-03-08 12:00:24 +01:00
191c5b8130 Make EditKeyActivity's uri handling (more) sane Vincent Breitmoser 2014-03-08 11:58:26 +01:00
8c6cb8b0ab working unified list (no actions yet) Vincent Breitmoser 2014-03-08 11:19:34 +01:00
b29c430959 Fix for #347 Nikhil Peter Raj 2014-03-08 15:28:46 +05:30
db05b3043a beta4 Dominik Schürmann 2014-03-08 00:17:24 +01:00
0e33fd2392 Split api libs into OpenKeychain specific and OpenPGP Provider lib Dominik Schürmann 2014-03-07 23:05:03 +01:00
3fbda4245c progress is shown when creating the default key based on number of keys created so far grait 2014-03-08 03:24:16 +05:30
2737aedca7 Revert "Fix for #347" Dominik Schürmann 2014-03-07 22:48:20 +01:00
882333ce05 Merge pull request #366 from uberspot/master Dominik Schürmann 2014-03-07 22:39:53 +01:00
7b1e3fef19 Merge pull request #367 from hav3n/branch-fixes Dominik Schürmann 2014-03-07 22:39:20 +01:00
def9e5a492 Move search view into onCreateView, fixes #365 Dominik Schürmann 2014-03-07 22:37:38 +01:00
477d06c43a removed useless semicolons, fixed some parameters in documenation, simplified some conditionals uberspot 2014-03-07 22:35:09 +02:00
c1c462db4f move hardcode strings to strings.xml uberspot 2014-03-07 22:12:58 +02:00
ca851ba21f remove unused imports and unthrown exceptions uberspot 2014-03-07 21:48:26 +02:00
dd80ddd6f9 Fix for #347 Nikhil Peter Raj 2014-03-08 02:04:50 +05:30
a1be0d302b move search view from activity to fragment by setting it as a list header, better reusability! Required for service activites Dominik Schürmann 2014-03-07 21:32:24 +01:00
3572571391 Reworking main KeyListPublicFragment to get progress indicator Dominik Schürmann 2014-03-07 20:58:33 +01:00
0a0bdad5b5 Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain Dominik Schürmann 2014-03-07 19:50:50 +01:00
ba61e69a7d Cleanup code, search with preceeding % Dominik Schürmann 2014-03-07 19:50:36 +01:00
e4736736b0 Merge pull request #361 from mb-14/file Dominik Schürmann 2014-03-07 18:37:22 +01:00
2e2a9bc967 Add option for sharing encrypted file. Miroojin Bakshi 2014-03-07 21:16:58 +05:30
b06e4d827a uncomment, use Parcel. Builds, not functional Ashley Hughes 2014-03-07 15:36:01 +00:00
fba0e2af1d keep up with master Ashley Hughes 2014-03-07 15:16:13 +00:00
59067f9f8b API: get key Dominik Schürmann 2014-03-07 11:24:53 +01:00
53ba741810 Fix API docs Dominik Schürmann 2014-03-07 11:05:11 +01:00
a3f17be192 Fix API docs Dominik Schürmann 2014-03-07 10:54:36 +01:00
04fa0e9cc7 use parcel to save keys, but saving existing keys is disabled, pending a rewrite... Ashley Hughes 2014-03-06 23:47:11 +00:00
b9a9bbe429 remove icon from nfc dialog Dominik Schürmann 2014-03-06 22:46:04 +01:00
0cb5d86860 back to Gradle 1.10, Using Gradle 1.11 requires Android Studio 0.5.0 which is not released yet Dominik Schürmann 2014-03-06 22:24:52 +01:00
3d944483d3 Merge pull request #344 from ankushb92/ankush2 Dominik Schürmann 2014-03-06 21:59:56 +01:00
8e29b82d6d corrected commit Ankush 2014-03-06 10:05:43 +05:30
9edd4bee70 fix pathes in README Dominik Schürmann 2014-03-06 19:49:54 +01:00
633cca21a0 remove unused search definitions from manifest Dominik Schürmann 2014-03-06 19:41:07 +01:00
28e4a75e7e Merge pull request #354 from uberspot/master Dominik Schürmann 2014-03-06 19:36:31 +01:00
414623670e sdk 17 no longer needed Dominik Schürmann 2014-03-06 19:36:37 +01:00
1cf912de2b Multiselect: Create 'select all' in public and secret keylist uberspot 2014-03-06 20:32:10 +02:00
0ed097a020 Merge pull request #353 from Emantor/new_gradle Dominik Schürmann 2014-03-06 19:32:12 +01:00
9d542ebf5b Update README Emantor 2014-03-06 19:11:11 +01:00
3ccb2b65cb Update missing build.gradle files Emantor 2014-03-06 19:02:07 +01:00
674e24b5d2 Switch from 0.9+ to 0.9.0 Emantor 2014-03-06 18:23:46 +01:00
53c1d95b8b Add new gradle-wrapper.jar Emantor 2014-03-06 18:22:19 +01:00
1ab663a495 Update gradlewrapper to gradle 1.11 Emantor 2014-03-06 17:43:33 +01:00
8e2d254976 Update to gradle 0.9+ jar Emantor 2014-03-06 17:32:00 +01:00
ea2f3e1444 Merge pull request #350 from uberspot/master Dominik Schürmann 2014-03-06 14:31:49 +01:00
ccbb6f95f4 add lock icon for 'Encrypt to..' multiselect option uberspot 2014-03-06 15:26:54 +02:00
4c6cbd211e Merge pull request #349 from uberspot/master Dominik Schürmann 2014-03-06 14:06:08 +01:00
e8fbf976da 2.3.1 beta3 Dominik Schürmann 2014-03-06 14:02:51 +01:00
4c49bdcccc Fix documentation and variable naming in API Dominik Schürmann 2014-03-06 14:02:21 +01:00