Merge branch 'develop' into setup_buttons

[pub/Android/ownCloud.git] / src / com / owncloud / android / authentication / AccountAuthenticator.java

diff --git a/src/com/owncloud/android/authentication/AccountAuthenticator.java b/src/com/owncloud/android/authentication/AccountAuthenticator.java
index c9da67b..a2a38e8 100644 (file)
--- a/src/com/owncloud/android/authentication/AccountAuthenticator.java
+++ b/src/com/owncloud/android/authentication/AccountAuthenticator.java
@@ -18,6 +18,10 @@
 
 package com.owncloud.android.authentication;
 
 
 package com.owncloud.android.authentication;
 

+import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
+

 import android.accounts.*;
 import android.content.Context;
 import android.content.Intent;
 import android.accounts.*;
 import android.content.Context;
 import android.content.Intent;


@@ -25,10 +29,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.widget.Toast;
 
 import android.os.Handler;
 import android.widget.Toast;
 

-import com.owncloud.android.Log_OC;
-import com.owncloud.android.MainApp;

 
 

-import com.owncloud.android.R;

 
 
 /**
 
 
 /**


@@ -142,13 +143,14 @@ public class AccountAuthenticator extends AbstractAccountAuthenticator {
 
             // Return an error
             bundle.putInt(AccountManager.KEY_ERROR_CODE, AccountManager.ERROR_CODE_UNSUPPORTED_OPERATION);
 
             // Return an error
             bundle.putInt(AccountManager.KEY_ERROR_CODE, AccountManager.ERROR_CODE_UNSUPPORTED_OPERATION);

-            bundle.putString(AccountManager.KEY_ERROR_MESSAGE, mContext.getString(R.string.auth_unsupported_multiaccount));
+            final String message = String.format(mContext.getString(R.string.auth_unsupported_multiaccount), mContext.getString(R.string.app_name)); 
+            bundle.putString(AccountManager.KEY_ERROR_MESSAGE, message);

            
             mHandler.post(new Runnable() {
 
                 @Override
                 public void run() {
            
             mHandler.post(new Runnable() {
 
                 @Override
                 public void run() {

-                    Toast.makeText(mContext, R.string.auth_unsupported_multiaccount, Toast.LENGTH_SHORT).show();
+                    Toast.makeText(mContext, message, Toast.LENGTH_SHORT).show();

                 }
             });
             
                 }
             });