Updated build gradle

app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarManager.java

@@ -5,8 +5,8 @@ import static ru.vtosters.lite.utils.Preferences.newfeed;
 import static ru.vtosters.lite.utils.Preferences.olddock;
 
 import com.vk.apps.AppsFragment;
-import com.vk.discover.DiscoverFeedFragment;
 import com.vk.discover.DiscoverFragment;
+import com.vk.discover.GatewaysFragment;
 import com.vk.fave.fragments.FaveTabFragment;
 import com.vk.feedlikes.fragments.FeedLikesFragment;
 import com.vk.menu.MenuFragment;
@@ -80,7 +80,7 @@ public class DockBarManager {
 
         if (!dockbar.exists()) {
             mSelectedTabs.add(new DockBarTab("tab_news", olddock() ? R.drawable.ic_newsfeed_28 : R.drawable.ic_menu_newsfeed_outline_28, R.string.newsfeed, R.id.tab_news, newfeed() ? HomeFragment.class : NewsfeedFragment.class));
-            mSelectedTabs.add(new DockBarTab("tab_discover", olddock() ? R.drawable.ic_search_28 : R.drawable.ic_menu_search_outline_28, R.string.search, R.id.tab_discover, newfeed() ? DiscoverFragment.class : DiscoverFeedFragment.class));
+            mSelectedTabs.add(new DockBarTab("tab_discover", olddock() ? R.drawable.ic_search_28 : R.drawable.ic_menu_search_outline_28, R.string.search, R.id.tab_discover, newfeed() ? GatewaysFragment.class : DiscoverFragment.class ));
             mSelectedTabs.add(new DockBarTab("tab_messages", olddock() ? R.drawable.ic_menu_messages_28 : R.drawable.ic_message_28_outline, R.string.messages, R.id.tab_messages, DialogsFragment.class));
             mSelectedTabs.add(new DockBarTab("tab_feedback", olddock() ? R.drawable.ic_menu_notifications_28 : R.drawable.ic_menu_notification_outline_28, R.string.feedback, R.id.tab_feedback, NotificationsContainerFragment.class));
             mSelectedTabs.add(new DockBarTab("tab_menu", olddock() ? R.drawable.ic_menu_more_28 : R.drawable.ic_menu_more_outline_28, R.string.menu, R.id.tab_menu, MenuFragment.class));
@@ -118,14 +118,14 @@ public class DockBarManager {
                     if (newfeed()) {
                         if (tab.fragmentClass == NewsfeedFragment.class) {
                             tab.fragmentClass = HomeFragment.class;
-                        } else if (tab.fragmentClass == DiscoverFeedFragment.class) {
+                        } else if (tab.fragmentClass == DiscoverFragment.class) {
                             tab.fragmentClass = DiscoverFragment.class;
                         }
                     } else {
                         if (tab.fragmentClass == HomeFragment.class) {
                             tab.fragmentClass = NewsfeedFragment.class;
-                        } else if (tab.fragmentClass == DiscoverFragment.class) {
-                            tab.fragmentClass = DiscoverFeedFragment.class;
+                        } else if (tab.fragmentClass == GatewaysFragment.class) {
+                            tab.fragmentClass = GatewaysFragment.class;
                         }
                     }
                     mSelectedTabs.add(tab);
@@ -144,14 +144,14 @@ public class DockBarManager {
                     if (newfeed()) {
                         if (tab.fragmentClass == NewsfeedFragment.class) {
                             tab.fragmentClass = HomeFragment.class;
-                        } else if (tab.fragmentClass == DiscoverFeedFragment.class) {
-                            tab.fragmentClass = DiscoverFragment.class;
+                        } else if (tab.fragmentClass == DiscoverFragment.class) {
+                            tab.fragmentClass = GatewaysFragment.class;
                         }
                     } else {
                         if (tab.fragmentClass == HomeFragment.class) {
                             tab.fragmentClass = NewsfeedFragment.class;
-                        } else if (tab.fragmentClass == DiscoverFragment.class) {
-                            tab.fragmentClass = DiscoverFeedFragment.class;
+                        } else if (tab.fragmentClass == GatewaysFragment.class) {
+                            tab.fragmentClass = DiscoverFragment.class;
                         }
                     }
                     mDisabledTabs.add(tab);

app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountManager.java

@@ -12,6 +12,8 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import ru.vtosters.lite.utils.Globals;
+
 public class MultiAccountManager {
 
     public static void migrate() {
@@ -20,7 +22,15 @@ public class MultiAccountManager {
         SharedPreferences NewPrefs = getContext().getSharedPreferences("pref_account_manager0", Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = NewPrefs.edit();
         editor.putString("key_vk_account", OldPrefsValue);
-        editor.apply();
+        editor.commit();
+    }
+
+    public static void migrationRestart() {
+        SharedPreferences prefs = getPreferences();
+        if (prefs.getBoolean("multiaccount_restart", true)) {
+            prefs.edit().putBoolean("multiaccount_restart", false).commit();
+            Globals.restartApplication();
+        }
     }
 
     public static SharedPreferences getCurrentAccount() {
@@ -80,7 +90,15 @@ public class MultiAccountManager {
         prefs.edit().clear().commit();
         File file = new File(new File(getContext().getFilesDir().getParent(), "shared_prefs"), "pref_account_manager" + i);
         if (file.exists()) file.delete();
-        if (account == i && getAccountPrefsCount() > 0)
-            switchAccount(buildList().get(0).index);
+        if (account == i && getAccountPrefsCount() > 0) {
+            List<MultiAccountItem> accounts = buildList();
+            if (accounts.size() > 0)
+                switchAccount(buildList().get(0).index);
+            else {
+                getContext().getSharedPreferences("pref_account_manager", Context.MODE_PRIVATE)
+                        .edit().clear().commit();
+                Globals.getPreferences().edit().putBoolean("multiaccount_restart", true).commit();
+            }
+        }
     }
 }

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

@@ -15,8 +15,8 @@ import static ru.vtosters.lite.utils.Preferences.postsrecomm;
 
 import com.vk.apps.AppsFragment;
 import com.vk.core.preference.Preference;
-import com.vk.discover.DiscoverFeedFragment;
 import com.vk.discover.DiscoverFragment;
+import com.vk.discover.GatewaysFragment;
 import com.vk.fave.fragments.FaveTabFragment;
 import com.vk.menu.MenuFragment;
 import com.vk.music.fragment.MusicFragment;
@@ -234,7 +234,7 @@ public class Newsfeed {
             return AppsFragment.class;
         }
         if (string.equals("discover")) {
-            return newfeed() ? DiscoverFragment.class : DiscoverFeedFragment.class;
+            return newfeed() ? GatewaysFragment.class : DiscoverFragment.class;
         }
         if (string.equals("notifications")) {
             return NotificationsContainerFragment.class;

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0-rc01'
+        classpath 'com.android.tools.build:gradle:7.2.0-rc02'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

smali/res/layout/appkit_empty.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:gravity="center"
     android:orientation="vertical"
-    android:background="?background_content"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     xmlns:android="http://schemas.android.com/apk/res/android">

smali/smali_classes4/com/vtosters/lite/AuthActivity.smali

@@ -500,6 +500,8 @@
     :cond_1
     invoke-super {p0}, Landroid/support/v4/app/FragmentActivity;->finish()V
 
+    invoke-static {}, Lru/vtosters/lite/ui/fragments/multiaccount/MultiAccountManager;->migrationRestart()V
+
     return-void
 .end method