cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,646 Commits 1 Branch 0 Tags
058f792566d0bacb327d32f0e59ffca2af7323bc
Commit Graph
721 Commits
Author SHA1 Message Date
Vincent Breitmoser e41e6ea0de import-log: more interface work 2014-06-10 15:27:26 +02:00
Vincent Breitmoser eac582a313 import-log: some cosmetics 2014-06-10 13:52:05 +02:00
Vincent Breitmoser 7324bfcb53 import-log: add LogDisplay activity 2014-06-10 01:53:25 +02:00
Vincent Breitmoser 067ffa876d import-log: add OperationResults, use it in ImportKeys operation 2014-06-10 01:31:28 +02:00
Dominik Schürmann 90f9646f25 Merge pull request #650 from open-keychain/v/import-log 
Parcelable operation result with logging capabilities + import logging
 2014-06-06 23:07:06 +02:00
Dominik Schürmann a0f43febbb Merge pull request #649 from mar-v-in/automatic-contact-discovery 
Automatic contact discovery and more
 2014-06-06 22:57:51 +02:00
Dominik Schürmann d2430fe0e3 Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage 2014-06-06 22:47:28 +02:00
Dominik Schürmann 341247d446 Hide subkeys, certs tabs in key view, checkable menu item to show/hide them 2014-06-06 22:46:39 +02:00
mar-v-in 55ca0841f6 Fixing TAG and string resource 2014-06-06 17:39:11 +02:00
Vincent Breitmoser c36b311d5f import-log: better stripped key logging 2014-06-06 17:29:39 +02:00
Vincent Breitmoser e083ccc370 import-log: add import log string resources 2014-06-06 16:15:45 +02:00
mar-v-in 80e9998640 Show keys with android contacts 
This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid.
 2014-06-05 23:22:21 +02:00
mar-v-in cae0071342 Merge branch 'master' into automatic-contact-discovery 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-06-04 21:32:37 +02:00
mar-v-in dd959876f4 First version of automatic contact discovery. 
TODO:
- Configuration (much of it)
- Enabled by default?
- Which keys to import? Current state: All non-revoked and non-expired with matching userid
- Search for keys if already known? Current state: yes, may cause traffic (configuration: only when wifi?)
- Update interval: Currently Android handles it, might be good (causes automatic refresh on new contact and stuff like that) or bad (too many of refreshes)
 2014-06-04 18:05:16 +02:00
Vincent Breitmoser 4a47126f05 Merge remote-tracking branch 'origin/master' into edit-key-rewrite 2014-06-02 18:49:24 +02:00
Dominik Schürmann 39997a802e Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-31 20:54:30 +02:00
Dominik Schürmann 6d1369be56 Pull from transifex 2014-05-31 20:49:56 +02:00
Tim Bray dfd5aa65a5 Add Log.d for QueryFailedException 2014-05-23 09:33:34 -07:00
Vincent Breitmoser 952bb99a24 Merge remote-tracking branch 'origin/master' into wrapped-key-ring 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-05-21 23:06:51 +02:00
Dominik Schürmann 8a2ffd8f90 Layout fixes for key import 2014-05-19 00:10:34 +02:00
Dominik Schürmann fd12f89ccb Clarify help start 2014-05-14 18:01:40 +02:00
Vincent Breitmoser 2f95100d88 Merge remote-tracking branch 'origin/master' into wrapped-key-ring 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
	OpenKeychain/src/main/res/values/strings.xml
 2014-05-14 16:02:28 +02:00
Dominik Schürmann be46eabdb5 Add pgpauth app to help, update html-textview 2014-05-13 18:52:48 +02:00
Dominik Schürmann 2aa3eb2bb5 Add Tim Bray to about 2014-05-09 11:38:40 +02:00
Dominik Schürmann 37ad355d20 Translations from transifex 2014-05-08 19:39:44 +02:00
Dominik Schürmann badfa9f7bc Changelog 2.7 2014-05-08 19:32:07 +02:00
Dominik Schürmann af4f32e2d7 Translations from transifex 2014-05-08 18:44:54 +02:00
Dominik Schürmann 33cad382f9 Use flat buttons where appropriate 2014-05-08 15:46:57 +02:00
Vincent Breitmoser 185c4eed43 use LoaderFragment in ViewKey tabs 
Closes #616
 2014-05-08 13:58:52 +02:00
Vincent Breitmoser 596478a212 extract generic LoaderFragment superclass from KeyList 2014-05-08 13:43:59 +02:00
Dominik Schürmann 5c747a747f Update from transifex 2014-05-08 11:30:16 +02:00
Dominik Schürmann b4a9d1a2db Add applications section to help 2014-05-07 18:31:31 +02:00
Dominik Schürmann b771276611 Start app menu item for registered apps 2014-05-07 15:03:24 +02:00
Dominik Schürmann e14ce09186 Better handling of actionbars back 2014-05-07 14:33:20 +02:00
Dominik Schürmann f4cbd8cabb Design fixes for certification activity 2014-05-07 14:17:18 +02:00
Dominik Schürmann 7c2dc276c1 Alignment in certify activity 2014-05-07 13:48:19 +02:00
Dominik Schürmann 10db9dd09a Change drawer nav icon back to gray 2014-05-07 11:15:40 +02:00
Dominik Schürmann 61fc8d0eee Translations from transifex 2014-05-07 11:01:33 +02:00
Dominik Schürmann fb0f3c4778 Use paste icon, clarify language once again 2014-05-07 10:59:16 +02:00
Dominik Schürmann 2481b6e660 Pull translations from transifex 2014-05-07 09:31:01 +02:00
Dominik Schürmann 0155335a59 Clarify language 2014-05-07 09:29:02 +02:00
Dominik Schürmann b405c1d664 Pull translations from transifex 2014-05-07 09:13:32 +02:00
Dominik Schürmann a36f7f80e2 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-07 09:05:38 +02:00
Dominik Schürmann dc382a2ddd Clarify language 2014-05-07 09:05:28 +02:00
Vincent Breitmoser 174858e9cf ui: apply theme to tab buttons 2014-05-07 03:55:06 +02:00
Vincent Breitmoser 12f1162a1e ui: use SlidingTabLayout in help activity 2014-05-07 03:48:03 +02:00
Vincent Breitmoser 40793935ac ui: primary certification icon was a pixel or two off 2014-05-07 03:19:09 +02:00
Vincent Breitmoser 65274f6c16 ui: purplize searchtext in keylist 2014-05-07 03:07:24 +02:00
Vincent Breitmoser 873b1be75d display AppMsg warning when no encryption subkey is available 2014-05-07 02:27:51 +02:00
Vincent Breitmoser 0bb11be749 ui: slight edit icon cosmetics in keylist 2014-05-07 02:15:09 +02:00