X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/2c9b84a862a7ed644bf03242449f37ca1065123d..d8e4a87c421840ff6f1b46e1441f88921347a181:/src/eu/alefzero/owncloud/ui/activity/AccountSelectActivity.java

diff --git a/src/eu/alefzero/owncloud/ui/activity/AccountSelectActivity.java b/src/eu/alefzero/owncloud/ui/activity/AccountSelectActivity.java
index fc7ef2ed..cc3cc61e 100644
--- a/src/eu/alefzero/owncloud/ui/activity/AccountSelectActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/AccountSelectActivity.java
@@ -131,7 +131,14 @@ public class AccountSelectActivity extends SherlockListActivity
   @Override
   public void run(AccountManagerFuture<Boolean> future) {
     if (future.isDone()) {
-      AccountUtils.setCurrentOwnCloudAccount(this, AccountUtils.getCurrentOwnCloudAccount(this).name);
+      Account a = AccountUtils.getCurrentOwnCloudAccount(this);
+      String accountName = "";
+      if (a == null) {
+        Account[] accounts = AccountManager.get(this).getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);
+        if (accounts.length != 0)
+          accountName = accounts[0].name;
+        AccountUtils.setCurrentOwnCloudAccount(this, accountName);
+      }
       populateAccountList();
     }
   }