Browse Source

Use constants for username/token/url

David Luhmer 6 years ago
parent
commit
dbef39c436

+ 10 - 0
src/main/java/com/nextcloud/android/sso/Constants.java

@@ -0,0 +1,10 @@
+package com.nextcloud.android.sso;
+
+public class Constants {
+
+    // Authenticator related constants
+    public final static String SSO_USERNAME = "username";
+    public final static String SSO_TOKEN = "token";
+    public final static String SSO_SERVER_URL = "server_url";
+
+}

+ 4 - 3
src/main/java/com/owncloud/android/authentication/AccountAuthenticator.java

@@ -33,6 +33,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Handler;
 import android.widget.Toast;
 import android.widget.Toast;
 
 
+import com.nextcloud.android.sso.Constants;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.R;
 import com.owncloud.android.db.PreferenceManager;
 import com.owncloud.android.db.PreferenceManager;
@@ -198,9 +199,9 @@ public class AccountAuthenticator extends AbstractAccountAuthenticator {
             result.putString(AccountManager.KEY_ACCOUNT_NAME,  account.name);
             result.putString(AccountManager.KEY_ACCOUNT_NAME,  account.name);
             result.putString(AccountManager.KEY_ACCOUNT_TYPE,  MainApp.getAccountType(mContext));
             result.putString(AccountManager.KEY_ACCOUNT_TYPE,  MainApp.getAccountType(mContext));
             result.putString(AccountManager.KEY_AUTHTOKEN,     NEXTCLOUD_SSO);
             result.putString(AccountManager.KEY_AUTHTOKEN,     NEXTCLOUD_SSO);
-            result.putString("username", userId);
-            result.putString("token", token);
-            result.putString("server_url", serverUrl);
+            result.putString(Constants.SSO_USERNAME,   userId);
+            result.putString(Constants.SSO_TOKEN,      token);
+            result.putString(Constants.SSO_SERVER_URL, serverUrl);
 
 
             return result;
             return result;
         }
         }