Added multi account feature

app/src/main/java/ru/vtosters/lite/ui/fragments/AccountsFragment.java

@@ -2,12 +2,9 @@ package ru.vtosters.lite.ui.fragments;
 
 import static android.content.Context.MODE_PRIVATE;
 import static ru.vtosters.lite.utils.Helper.GetContext;
-import static ru.vtosters.lite.utils.Helper.GetPreferences;
-import static ru.vtosters.lite.utils.Helper.getUserLastName;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.preference.Preference;
 
 import com.vk.audio.AudioMessageUtils;
 import com.vk.auth.api.VKAccount;
@@ -20,8 +17,6 @@ import com.vtosters.lite.auth.VKAccountManager;
 import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
 import com.vtosters.lite.im.ImEngineProvider;
 
-import ru.vtosters.lite.tgs.TGPref;
-import ru.vtosters.lite.tgs.TGRoot;
 import ru.vtosters.lite.ui.PreferencesUtil;
 import ru.vtosters.lite.utils.AccountManager;
 import ru.vtosters.lite.utils.Helper;
@@ -32,18 +27,12 @@ public class AccountsFragment extends MaterialPreferenceToolbarFragment {
     public void b(Bundle bundle) {
         super.b(bundle);
 
-        ToastUtils.a(AccountManager.getAvalibleAcc());
-
         int vtosterXml = Helper.GetContext().getResources().getIdentifier("empty", "xml", Helper.GetContext().getPackageName());
         this.a(vtosterXml);
 
         PreferencesUtil.addPreferenceCategory(this, "Аккаунты");
 
-        PreferencesUtil.addListPreference(this, "account", "", "Выберите аккаунт", new CharSequence[]{
-                AccountManager.getName("0"), AccountManager.getName("1")
-        }, new String[]{
-                "0", "1"
-        });
+        PreferencesUtil.addListPreference(this, "account", "", "Выберите аккаунт", AccountManager.getAccAmountNames(), AccountManager.getAccAmount());
 
         a("account").b(AccountManager.getCurrentAccountName());
 
@@ -62,7 +51,7 @@ public class AccountsFragment extends MaterialPreferenceToolbarFragment {
         PreferencesUtil.addPreference(this, "newacc", "Добавить аккаунт", "", null, preference -> {
             SharedPreferences sharedPrefs = GetContext().getSharedPreferences("com.vtosters.lite_preferences", MODE_PRIVATE);
             SharedPreferences.Editor editor = sharedPrefs.edit();
-            editor.putString("account", Integer.toString(AccountManager.getAvalibleAccInt() + 1));
+            editor.putString("account", Integer.toString(AccountManager.getAvalibleAcc()));
             editor.commit();
 
             VKImageLoader.b();
@@ -75,12 +64,10 @@ public class AccountsFragment extends MaterialPreferenceToolbarFragment {
             ToastUtils.a("Перезапустите приложение");
             return false;
         });
-
     }
 
     @Override
     public int aq() {
         return Helper.GetContext().getResources().getIdentifier("sett_account", "string", Helper.GetContext().getPackageName());
     }
-
 }

app/src/main/java/ru/vtosters/lite/utils/AccountManager.java

@@ -5,6 +5,7 @@ import static ru.vtosters.lite.utils.Helper.GetContext;
 
 import android.content.SharedPreferences;
 
+import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -42,7 +43,7 @@ public class AccountManager {
         return "err";
     }
 
-    public static String getAvalibleAcc() {
+    public static int getAvalibleAcc() {
         int intg = 0;
         while (true) {
             if (getName(Integer.toString(intg)) != "err") {
@@ -50,19 +51,38 @@ public class AccountManager {
             } else {
                 break;
             }
-        };
-        return Integer.toString(intg);
-    }
-
-    public static int getAvalibleAccInt() {
-        int intg = 0;
-        while (true) {
-            if (getName(Integer.toString(intg)) != "err") {
-                intg++;
-            } else {
-                break;
-            }
-        };
+        }
+        ;
         return intg;
     }
+
+    public static CharSequence[] getAccAmountNames() {
+        int intg = 0;
+        ArrayList<String> list = new ArrayList<String>();
+        while (true) {
+            if (getName(Integer.toString(intg)) != "err") {
+                list.add(getName(Integer.toString(intg)));
+                intg++;
+            } else {
+                break;
+            }
+        };
+        final CharSequence[] charSequenceItems = list.toArray(new CharSequence[list.size()]);
+        return charSequenceItems;
+    }
+
+    public static CharSequence[] getAccAmount() {
+        int intg = 0;
+        ArrayList<String> list = new ArrayList<String>();
+        while (true) {
+            if (getName(Integer.toString(intg)) != "err") {
+                list.add(Integer.toString(intg));
+                intg++;
+            } else {
+                break;
+            }
+        };
+        final CharSequence[] charSequenceItems = list.toArray(new CharSequence[list.size()]);
+        return charSequenceItems;
+    }
 }