From dca61fcd16a6e9723cbd381ec2e954c8e7f5eca4 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Wed, 30 Mar 2022 14:51:50 +0300
Subject: [PATCH] Improvements of multiacc

---
 .../lite/ui/fragments/AccountsFragment.java      | 14 +++++++++++++-
 .../main/java/ru/vtosters/lite/utils/Helper.java | 16 +++++++---------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/AccountsFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/AccountsFragment.java
index e74e9c06b..a8c62195d 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/AccountsFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/AccountsFragment.java
@@ -1,13 +1,20 @@
 package ru.vtosters.lite.ui.fragments;
 
+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.os.Bundle;
+import android.support.v7.preference.Preference;
 
 import com.vk.audio.AudioMessageUtils;
+import com.vk.auth.api.VKAccount;
 import com.vk.core.f.FileUtils;
+import com.vk.core.util.AppContextHolder;
+import com.vk.core.util.ToastUtils;
 import com.vk.imageloader.VKImageLoader;
+import com.vk.pushes.PushSubscriber;
+import com.vtosters.lite.auth.VKAccountManager;
 import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
 import com.vtosters.lite.im.ImEngineProvider;
 
@@ -40,7 +47,12 @@ public class AccountsFragment extends MaterialPreferenceToolbarFragment {
             ImEngineProvider.a().h();
             AudioMessageUtils.j();
             FileUtils.l();
-            //Helper.restarting(); TODO Implement a soft restart for activities and fragments or hard restart after applying changes
+            VKAccount b = VKAccountManager.b();
+            PushSubscriber.a.a(b.b(), b.c());
+            AppContextHolder.a.getSharedPreferences("gcm", 0).edit().clear().apply();
+            AccountsFragment.this.aB().postDelayed(() -> {
+                PushSubscriber.a.a(true);
+            }, 1000);
             return true;
         });
     }
diff --git a/app/src/main/java/ru/vtosters/lite/utils/Helper.java b/app/src/main/java/ru/vtosters/lite/utils/Helper.java
index e5d177120..6c3e7d8d0 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Helper.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Helper.java
@@ -1,16 +1,11 @@
 package ru.vtosters.lite.utils;
 
-import static android.content.Context.ACTIVITY_SERVICE;
-
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.preference.PreferenceManager;
-import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
@@ -22,7 +17,6 @@ import com.vtosters.lite.auth.VKAccountManager;
 import com.vtosters.lite.im.ImEngineProvider;
 
 import java.lang.reflect.Method;
-import java.util.List;
 
 public class Helper {
     public static int GetUserId() {
@@ -69,8 +63,12 @@ public class Helper {
         return extendedUserProfile.a;
     }
 
-    public static void restarting() {
-        GetContext().startActivity(Intent.makeRestartActivityTask(GetContext().getPackageManager().getLaunchIntentForPackage(GetContext().getPackageName()).getComponent()));
+    public static void restarting(){
+        Context ctx = GetContext();
+        PackageManager pm = ctx.getPackageManager();
+        Intent intent = pm.getLaunchIntentForPackage(ctx.getPackageName());
+        Intent mainIntent = Intent.makeRestartActivityTask(intent.getComponent());
+        ctx.startActivity(mainIntent);
         Runtime.getRuntime().exit(0);
     }