diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index fd26d6acf..9a2011205 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -53,6 +53,10 @@
+
+
+
+
@@ -435,6 +439,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
index f911318a0..3ac3a9dee 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
@@ -17,6 +17,8 @@
package org.sufficientlysecure.keychain;
+import android.accounts.Account;
+import android.accounts.AccountManager;
import android.app.Application;
import android.content.Context;
import android.graphics.PorterDuff;
@@ -76,6 +78,17 @@ public class KeychainApplication extends Application {
brandGlowEffect(getApplicationContext(),
getApplicationContext().getResources().getColor(R.color.emphasis));
+
+ setupAccountAsNeeded();
+ }
+
+ private void setupAccountAsNeeded() {
+ AccountManager manager = AccountManager.get(this);
+ Account[] accounts = manager.getAccountsByType(getPackageName());
+ if (accounts == null || accounts.length == 0) {
+ Account dummy = new Account(getString(R.string.app_name), getPackageName());
+ manager.addAccountExplicitly(dummy, null, null);
+ }
}
static void brandGlowEffect(Context context, int brandColor) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/EmailKeyHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/EmailKeyHelper.java
new file mode 100644
index 000000000..80f52f914
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/EmailKeyHelper.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2014 Dominik Schürmann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package org.sufficientlysecure.keychain.helper;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Messenger;
+import org.sufficientlysecure.keychain.keyimport.HkpKeyserver;
+import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry;
+import org.sufficientlysecure.keychain.keyimport.Keyserver;
+import org.sufficientlysecure.keychain.service.KeychainIntentService;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class EmailKeyHelper {
+
+ public static void importContacts(Context context, Messenger messenger) {
+ importAll(context, messenger, ContactHelper.getContactMails(context));
+ }
+
+ public static void importAll(Context context, Messenger messenger, List mails) {
+ Set keys = new HashSet();
+ for (String mail : mails) {
+ keys.addAll(getEmailKeys(context, mail));
+ }
+ importKeys(context, messenger, new ArrayList(keys));
+ }
+
+ public static List getEmailKeys(Context context, String mail) {
+ Set keys = new HashSet();
+
+ // Try _hkp._tcp SRV record first
+ String[] mailparts = mail.split("@");
+ if (mailparts.length == 2) {
+ HkpKeyserver hkp = HkpKeyserver.resolve(mailparts[1]);
+ if (hkp != null) {
+ keys.addAll(getEmailKeys(mail, hkp));
+ }
+ }
+
+ // Most users don't have the SRV record, so ask a default server as well
+ String[] servers = Preferences.getPreferences(context).getKeyServers();
+ if (servers != null && servers.length != 0) {
+ HkpKeyserver hkp = new HkpKeyserver(servers[0]);
+ keys.addAll(getEmailKeys(mail, hkp));
+ }
+ return new ArrayList(keys);
+ }
+
+ private static void importKeys(Context context, Messenger messenger, List keys) {
+ Intent importIntent = new Intent(context, KeychainIntentService.class);
+ importIntent.setAction(KeychainIntentService.ACTION_DOWNLOAD_AND_IMPORT_KEYS);
+ Bundle importData = new Bundle();
+ importData.putParcelableArrayList(KeychainIntentService.DOWNLOAD_KEY_LIST,
+ new ArrayList(keys));
+ importIntent.putExtra(KeychainIntentService.EXTRA_DATA, importData);
+ importIntent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
+
+ context.startService(importIntent);
+ }
+
+ public static List getEmailKeys(String mail, Keyserver keyServer) {
+ Set keys = new HashSet();
+ try {
+ for (ImportKeysListEntry key : keyServer.search(mail)) {
+ if (key.isRevoked() || key.isExpired()) continue;
+ for (String userId : key.getUserIds()) {
+ if (userId.toLowerCase().contains(mail.toLowerCase())) {
+ keys.add(key);
+ }
+ }
+ }
+ } catch (Keyserver.QueryFailedException ignored) {
+ } catch (Keyserver.QueryNeedsRepairException ignored) {
+ }
+ return new ArrayList(keys);
+ }
+}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
new file mode 100644
index 000000000..4d0397196
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2014 Dominik Schürmann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package org.sufficientlysecure.keychain.service;
+
+import android.accounts.Account;
+import android.app.Service;
+import android.content.AbstractThreadedSyncAdapter;
+import android.content.ContentProviderClient;
+import android.content.Intent;
+import android.content.SyncResult;
+import android.os.*;
+import org.sufficientlysecure.keychain.helper.EmailKeyHelper;
+import org.sufficientlysecure.keychain.util.Log;
+
+public class ContactSyncAdapterService extends Service {
+
+ private class ContactSyncAdapter extends AbstractThreadedSyncAdapter {
+
+ public ContactSyncAdapter() {
+ super(ContactSyncAdapterService.this, true);
+ }
+
+ @Override
+ public void onPerformSync(Account account, Bundle extras, String authority, ContentProviderClient provider,
+ final SyncResult syncResult) {
+ EmailKeyHelper.importContacts(getContext(), new Messenger(new Handler(Looper.getMainLooper(),
+ new Handler.Callback() {
+ @Override
+ public boolean handleMessage(Message msg) {
+ Bundle data = msg.getData();
+ switch (msg.arg1) {
+ case KeychainIntentServiceHandler.MESSAGE_OKAY:
+ return true;
+ case KeychainIntentServiceHandler.MESSAGE_UPDATE_PROGRESS:
+ if (data.containsKey(KeychainIntentServiceHandler.DATA_PROGRESS) &&
+ data.containsKey(KeychainIntentServiceHandler.DATA_PROGRESS_MAX)) {
+ Log.d("Keychain/ContactSync/DownloadKeys", "Progress: " +
+ data.getInt(KeychainIntentServiceHandler.DATA_PROGRESS) + "/" +
+ data.getInt(KeychainIntentServiceHandler.DATA_PROGRESS_MAX));
+ return false;
+ }
+ default:
+ Log.d("Keychain/ContactSync/DownloadKeys", "Syncing... " + msg.toString());
+ return false;
+ }
+ }
+ })));
+ }
+ }
+
+ @Override
+ public IBinder onBind(Intent intent) {
+ return new ContactSyncAdapter().getSyncAdapterBinder();
+ }
+}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/DummyAccountService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/DummyAccountService.java
new file mode 100644
index 000000000..d3b29d5cf
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/DummyAccountService.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2014 Dominik Schürmann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package org.sufficientlysecure.keychain.service;
+
+import android.accounts.AbstractAccountAuthenticator;
+import android.accounts.Account;
+import android.accounts.AccountAuthenticatorResponse;
+import android.accounts.NetworkErrorException;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Message;
+import android.widget.Toast;
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.util.Log;
+
+/**
+ * This service actually does nothing, it's sole task is to show a Toast if the use tries to create an account.
+ */
+public class DummyAccountService extends Service {
+
+ private class Toaster {
+ private static final String TOAST_MESSAGE = "toast_message";
+ private Context context;
+ private Handler handler = new Handler(new Handler.Callback() {
+ @Override
+ public boolean handleMessage(Message msg) {
+ Toast.makeText(context, msg.getData().getString(TOAST_MESSAGE), Toast.LENGTH_LONG).show();
+ return true;
+ }
+ });
+
+ private Toaster(Context context) {
+ this.context = context;
+ }
+
+ public void toast(int resourceId) {
+ toast(context.getString(resourceId));
+ }
+
+ public void toast(String message) {
+ Message msg = new Message();
+ Bundle bundle = new Bundle();
+ bundle.putString(TOAST_MESSAGE, message);
+ msg.setData(bundle);
+ handler.sendMessage(msg);
+ }
+ }
+
+ private class Authenticator extends AbstractAccountAuthenticator {
+
+ public Authenticator() {
+ super(DummyAccountService.this);
+ }
+
+ @Override
+ public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) {
+ Log.d("DummyAccountService", "editProperties");
+ return null;
+ }
+
+ @Override
+ public Bundle addAccount(AccountAuthenticatorResponse response, String accountType, String authTokenType,
+ String[] requiredFeatures, Bundle options) throws NetworkErrorException {
+ response.onResult(new Bundle());
+ toaster.toast(R.string.info_no_manual_account_creation);
+ Log.d("DummyAccountService", "addAccount");
+ return null;
+ }
+
+ @Override
+ public Bundle confirmCredentials(AccountAuthenticatorResponse response, Account account, Bundle options)
+ throws NetworkErrorException {
+ Log.d("DummyAccountService", "confirmCredentials");
+ return null;
+ }
+
+ @Override
+ public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account, String authTokenType,
+ Bundle options) throws NetworkErrorException {
+ Log.d("DummyAccountService", "getAuthToken");
+ return null;
+ }
+
+ @Override
+ public String getAuthTokenLabel(String authTokenType) {
+ Log.d("DummyAccountService", "getAuthTokenLabel");
+ return null;
+ }
+
+ @Override
+ public Bundle updateCredentials(AccountAuthenticatorResponse response, Account account, String authTokenType,
+ Bundle options) throws NetworkErrorException {
+ Log.d("DummyAccountService", "updateCredentials");
+ return null;
+ }
+
+ @Override
+ public Bundle hasFeatures(AccountAuthenticatorResponse response, Account account, String[] features)
+ throws NetworkErrorException {
+ Log.d("DummyAccountService", "hasFeatures");
+ return null;
+ }
+ }
+
+ private Toaster toaster;
+
+ @Override
+ public IBinder onBind(Intent intent) {
+ toaster = new Toaster(this);
+ return new Authenticator().getIBinder();
+ }
+}
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 1ba8a6d2d..70b8616d4 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -518,5 +518,7 @@
unknown
cannot sign
No encryption subkey available!
+ Do not create OpenKeychain-Accounts manually.
+ For more information, see Help.
diff --git a/OpenKeychain/src/main/res/xml/account_desc.xml b/OpenKeychain/src/main/res/xml/account_desc.xml
new file mode 100644
index 000000000..94ffdf40b
--- /dev/null
+++ b/OpenKeychain/src/main/res/xml/account_desc.xml
@@ -0,0 +1,6 @@
+
+
+
diff --git a/OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml b/OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml
new file mode 100644
index 000000000..3318f3b45
--- /dev/null
+++ b/OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml b/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml
new file mode 100644
index 000000000..d8fe60e91
--- /dev/null
+++ b/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml
@@ -0,0 +1,6 @@
+
+
\ No newline at end of file