1 files changed, 13 insertions, 0 deletions
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) {