From 18de5e9289ccf9a1fc113aef55f9dba58468403a Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Wed, 30 Mar 2022 17:16:23 +0300
Subject: [PATCH] Improvements of multiacc + added migrating from old type of
 accounts to new type

---
 .../vtosters/lite/utils/AccountManager.java   | 21 +++++++++++++------
 .../java/ru/vtosters/lite/utils/Prefs.java    |  2 +-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/utils/AccountManager.java b/app/src/main/java/ru/vtosters/lite/utils/AccountManager.java
index 96fa887d3..a9ffda5d5 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/AccountManager.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/AccountManager.java
@@ -1,6 +1,7 @@
 package ru.vtosters.lite.utils;
 
 import static android.content.Context.MODE_PRIVATE;
+import static ru.vtosters.lite.utils.Helper.GetContext;
 
 import android.content.SharedPreferences;
 
@@ -13,6 +14,15 @@ public class AccountManager {
         return Helper.GetContext().getSharedPreferences("pref_account_manager" + Value, MODE_PRIVATE);
     }
 
+    public static void MigrateToNewType() {
+        SharedPreferences OldPrefs = Helper.GetContext().getSharedPreferences("pref_account_manager", MODE_PRIVATE);
+        String OldPrefsValue = OldPrefs.getString("key_vk_account", "");
+        SharedPreferences NewPrefs = GetContext().getSharedPreferences("pref_account_manager0", MODE_PRIVATE);
+        SharedPreferences.Editor editor = NewPrefs.edit();
+        editor.putString("key_vk_account", OldPrefsValue);
+        editor.commit();
+    }
+
     public static String getCurrentAccountName() {
         String Value = ru.vtosters.lite.utils.Helper.GetPreferences().getString("account", "");
         return getName(Value);
@@ -31,26 +41,25 @@ public class AccountManager {
         }
         return "err";
     }
-    public static String getAvalibleAcc(){
+
+    public static String getAvalibleAcc() {
         int intg = 0;
         while (true) {
             if (getName(Integer.toString(intg)) != "err") {
                 intg++;
-            }
-            else {
+            } else {
                 break;
             }
         };
         return Integer.toString(intg);
     }
 
-    public static int getAvalibleAccInt(){
+    public static int getAvalibleAccInt() {
         int intg = 0;
         while (true) {
             if (getName(Integer.toString(intg)) != "err") {
                 intg++;
-            }
-            else {
+            } else {
                 break;
             }
         };
diff --git a/app/src/main/java/ru/vtosters/lite/utils/Prefs.java b/app/src/main/java/ru/vtosters/lite/utils/Prefs.java
index 0543626b8..4b100b161 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Prefs.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Prefs.java
@@ -707,7 +707,7 @@ public class Prefs {
         setupFilters();
         fixGapps();
         setProxy();
-
+        AccountManager.MigrateToNewType();
         registerActivities(application);
     }