cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,704 Commits 1 Branch 0 Tags
c8a0eb3a083c92b654610f34655fed80312a8ef1
Commit Graph

221 Commits

Author SHA1 Message Date
Dominik Schürmann
7dd5e22353 Merge branch 'master' into backup-api 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
	extern/openpgp-api-lib
 2016-05-07 12:01:16 +03:00
Dominik Schürmann
67607933ad Merge branch 'master' of https://github.com/LuboViluda/open-keychain into LuboViluda-master 2016-04-29 23:03:13 +02:00
Nikita Mikhailov
3798249570 OTG: Implement hidden activity usb detection technique 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
bd2906a887 OTG: Add usb device manager prototype 2016-04-14 22:48:01 +06:00
Lubo Viluda
05da8afad9 Theme change 
Theme.Keychain.Transparet is used
 2016-03-24 19:45:59 +01:00
Lubo Viluda
298f89d36e upgrade of Redirect import activity 
-> RedirectImportActivity is transparent now
-> some poinlessly data removed
-> String moved into sources
-> xml for activity simplified
 2016-03-24 00:54:28 +01:00
Advaita
cab3fa7874 Final commit 
All changes included

Improvements

-Reformatted code wherever required
-Only active wifi connections trigger events
-Improve sync reliability
-Removed extra permission

Minor Changes

-Refactored 2 variables for easier readbility
-Wifi-Only-Sync is now enabled by default
 2016-03-23 20:54:10 +05:30
Lubo Viluda
7efeebc638 #1661 - Don't expose CertifyActivity 
*Add new activity - RedirectImportKeysActivity, which prompts user to
use Openkeychain directly
*Add intent filter for the activity
*Change intent filter for CertifyActivity
 2016-03-20 11:52:36 +01:00
Dominik Schürmann
eef8abcf80 Version 3.9 2016-03-03 13:34:08 +01:00
Vincent Breitmoser
c7761d09cb handle openpgp4fpr intent filter as import rather than certify (see #1661) 2016-03-02 15:12:14 +01:00
Dominik Schürmann
a2dcb579ff Add backup API 2016-03-01 00:22:19 +01:00
Vincent Breitmoser
da3167476b external-provider: add (experimental) external provider 2016-02-24 11:31:32 +01:00
Dominik Schürmann
f54f12c48c Extend documentation, proper method naming, use of deprecated method annotation 2016-02-22 15:19:06 +01:00
Dominik Schürmann
15488c5445 Split remote methods from activities for better seperation 2016-02-22 15:06:45 +01:00
Dominik Schürmann
eef27a544f Extract service parts from SecurityTokenOperationActivity 2016-02-22 15:06:45 +01:00
Dominik Schürmann
bb997920f5 Split RemoteServiceActivity into multiple activities 2016-02-15 13:25:55 +01:00
Hans-Christoph Steiner
ce03deada5 after receiving panic trigger and locking app, remove from history 
This makes the app fully exit, and removes it from the Recent Apps listing.
 2016-01-13 23:19:11 +01:00
Hans-Christoph Steiner
f8b58079eb respond to generic panic trigger Intent by clearing passphrases 
PanicKit provides a common framework for creating "panic button" apps that
can trigger actions in "panic responder" apps.  In this case, the response
is to clear all the cached passphrases.
 2016-01-13 23:19:11 +01:00
Dominik Schürmann
5e3e6e2d62 Fix singleTop definitions 2016-01-11 18:04:09 +01:00
Dominik Schürmann
0fd5b45df9 Use more generic 'Security Token' where possible, add sutitle to create key what tokens are supported 2016-01-10 17:17:57 +01:00
Vincent Breitmoser
1754a88ac3 inline-ttl: create ttl choice customization setting activity 2016-01-06 16:24:12 +01:00
Dominik Schürmann
269330f04f Add activity to edit user ids only 2015-12-30 16:47:42 +01:00
Dominik Schürmann
a4d24b01b8 Opt out from fullBackupContent for now 2015-12-22 14:02:48 +01:00
Adithya Abraham Philip
f29280bbb2 added Facebook links support, reworked Preferences 2015-12-06 00:46:52 +05:30
Dominik Schürmann
01b89d1d9c Revert "Add first time wizard for sync settings" 
This reverts commit cd601988db.
 2015-11-23 23:25:56 +01:00
Dominik Schürmann
cd601988db Add first time wizard for sync settings 2015-11-23 10:46:32 +01:00
Dominik Schürmann
c5bcbce28f Show notification when READ_CONTACTS permission is denied in sync service, hide linked contact card if permission is denied 2015-11-23 09:06:12 +01:00
Dominik Schürmann
31a45759cc Add READ_EXTERNAL_STORAGE permission 2015-11-03 10:59:53 +01:00
Dominik Schürmann
8f070e2450 Support for Android 6 ACTION_PROCESS_TEXT 2015-11-02 19:16:24 +01:00
Dominik Schürmann
05df0a63b7 Fix API 23 regression for activities without layout, see http://stackoverflow.com/q/32169303 2015-11-02 18:09:41 +01:00
Dominik Schürmann
96bed5ef1a Update zxing-android-embedded with new custom activity 2015-10-26 19:58:56 +01:00
Dominik Schürmann
7384fa7f2b Rename TemporaryStorageProvider to TemporaryFileProvider, use interface for db contract 2015-10-15 19:37:08 +02:00
Vincent Breitmoser
5b6c04cbfb enc-export: handle onSaveInstanceState, add nicer layout for landscape 2015-09-29 05:33:30 +02:00
Vincent Breitmoser
0e613aff2e Merge remote-tracking branch 'origin/master' into encrypted-export 2015-09-28 18:27:29 +02:00
Vincent Breitmoser
d94ebb2269 encrypted export WIP 2015-09-19 15:29:44 +02:00
Dominik Schürmann
f253c9e206 Fix DECRYPT_DATA intent 2015-09-18 22:51:13 +02:00
Vincent Breitmoser
9ac7b33a4e enable view intent with text/plain (related #290) 2015-09-16 17:47:44 +02:00
Vincent Breitmoser
d2ce770c1a Merge branch 'master' of github.com:open-keychain/open-keychain 2015-09-06 00:59:12 +02:00
Vincent Breitmoser
31cfbdc5d2 linked: fix "navigate up" in LinkedIdWizard (imperfect) 2015-09-06 00:58:13 +02:00
Kaladin Light
dd850e5c72 Fixes open-keychain/open-keychain#1515 
Move launcher icons to mipmap
 2015-09-03 13:25:09 -04:00
Vincent Breitmoser
2cda486427 linked: use webview instead of app, and some minor layoutings 2015-09-02 04:14:45 +02:00
Vincent Breitmoser
b52a0303ca linked: redesign github resource creation, implement ouath flow (WIP) 2015-09-01 06:42:10 +02:00
Vincent Breitmoser
e037b78248 Merge remote-tracking branch 'origin/master' 2015-08-29 13:29:51 +02:00
Vincent Breitmoser
a6e25e6448 Merge branch 'linked-identities' (and fix OperationHelper ids) 
Merge Linked Identities.

Also includes an important fix for OperationHelper ids, which had an
error in the bit mask logic.

Conflicts:
	Graphics/update-drawables.sh
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
	OpenKeychain/src/main/res/anim/fade_in.xml
	OpenKeychain/src/main/res/anim/fade_out.xml
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
	OpenKeychain/src/main/res/layout/view_key_fragment.xml
	OpenKeychain/src/main/res/menu/key_view.xml
	OpenKeychain/src/main/res/values/strings.xml
	OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
	README.md
 2015-08-29 13:28:56 +02:00
Dominik Schürmann
2569984601 Merge branch 'master' of https://github.com/mgeier63/open-keychain into mgeier63-master 2015-08-28 17:08:10 +02:00
Dominik Schürmann
7a98ffc90a Remove dead code 2015-08-27 12:34:54 +02:00
mgeier63
d3bda96953 service side support for https://github.com/open-keychain/openpgp-api/pull/3 2015-08-27 09:12:21 +02:00
Adithya Abraham Philip
6af24527da changed sync name 2015-08-20 21:02:29 +05:30
Adithya Abraham Philip
1ef6f883e3 introduced keyserver sync adapter 2015-08-20 21:02:29 +05:30
Dominik Schürmann
2ef691b264 Fix theme problems 2015-08-18 11:19:50 +02:00