From ad5f658423d56614341ebef90774d6ed7266c558 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Thu, 16 Jun 2022 16:51:27 +0300 Subject: [PATCH] small fixes --- .../lite/ui/fragments/FeedFragment.java | 4 +-- .../lite/ui/fragments/OtherFragment.java | 23 +++++++++------ .../java/ru/vtosters/lite/utils/Globals.java | 28 ++++++++++++++++++- 3 files changed, 44 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java index b3f0db225..740ab4ee6 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java @@ -21,10 +21,10 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment { } private void prefs() { - a("officialnewssett").a(new FeedFragment.openofficialsett()); + a("officialnewssett").a(new openofficialsett()); } - public class openofficialsett implements Preference.c { + public static class openofficialsett implements Preference.c { openofficialsett() { } diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java index 2c4bb9232..6716aa09a 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java @@ -2,6 +2,7 @@ package ru.vtosters.lite.ui.fragments; import static android.widget.Toast.LENGTH_SHORT; import static android.widget.Toast.makeText; +import static ru.vtosters.lite.utils.Globals.deleteCache; import static ru.vtosters.lite.utils.Globals.getContext; import static ru.vtosters.lite.utils.Globals.getString; import static ru.vtosters.lite.utils.Globals.getUserToken; @@ -68,24 +69,27 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment { } } - public class e implements Preference.c { + public static class e implements Preference.c { e() { } @Override // android.support.v7.preference.Preference.c public boolean a(Preference preference) { SharedPreferences prefs = getContext().getSharedPreferences("stickers", Context.MODE_PRIVATE); + SharedPreferences prefs2 = getContext().getSharedPreferences("stickers_storage", Context.MODE_PRIVATE); prefs.edit().clear().commit(); + prefs2.edit().clear().commit(); VKImageLoader.b(); ImEngineProvider.a().h(); AudioMessageUtils.j(); FileUtils.l(); + deleteCache(); ToastUtils.a(getString("cachecleaned")); return true; } } - public class b implements Preference.c { + public static class b implements Preference.c { b() { } @@ -96,7 +100,7 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment { } } - public class d implements Preference.c { + public static class d implements Preference.c { d() { } @@ -126,20 +130,23 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment { } } - public class f implements Preference.c { + public static class f implements Preference.c { f() { } @Override // android.support.v7.preference.Preference.c public boolean a(Preference preference) { SharedPreferences prefs = getContext().getSharedPreferences("stickers", Context.MODE_PRIVATE); + SharedPreferences prefs2 = getContext().getSharedPreferences("stickers_storage", Context.MODE_PRIVATE); prefs.edit().clear().commit(); - restartApplication(); + prefs2.edit().clear().commit(); + deleteCache(); + ToastUtils.a(getString("cachecleaned")); return true; } } - public class deleteprefs implements Preference.c { + public static class deleteprefs implements Preference.c { deleteprefs() { } @@ -151,7 +158,7 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment { } } - public class saveprefs implements Preference.c { + public static class saveprefs implements Preference.c { saveprefs() { } @@ -162,7 +169,7 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment { } } - public class restoreprefs implements Preference.c { + public static class restoreprefs implements Preference.c { restoreprefs() { } diff --git a/app/src/main/java/ru/vtosters/lite/utils/Globals.java b/app/src/main/java/ru/vtosters/lite/utils/Globals.java index 5409cf8eb..92ec6aa07 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Globals.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Globals.java @@ -42,6 +42,7 @@ import com.vtosters.lite.api.ExtendedUserProfile; import com.vtosters.lite.auth.VKAccountManager; import com.vtosters.lite.im.ImEngineProvider; +import java.io.File; import java.io.InputStream; import java.lang.reflect.Method; import java.net.URL; @@ -50,11 +51,12 @@ import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.List; import java.util.Locale; +import java.util.Objects; import ru.vtosters.lite.ui.dialogs.DisableBattery; import ru.vtosters.lite.ui.dialogs.InstallGMS; -import ru.vtosters.lite.ui.dialogs.Start; import ru.vtosters.lite.ui.dialogs.OTADialog; +import ru.vtosters.lite.ui.dialogs.Start; public class Globals { private static final List activities = new ArrayList<>(); @@ -200,7 +202,31 @@ public class Globals { return null; } // Getting the global context through reflection to use context on application initialization + public static void deleteCache() { + try { + File dir = getContext().getCacheDir(); + deleteDir(dir); + } catch (Exception e) { + e.printStackTrace(); + } + } + public static boolean deleteDir(File dir) { + if (dir != null && dir.isDirectory()) { + String[] children = dir.list(); + for (int i=0; i < Objects.requireNonNull(children).length; i++) { + boolean success = deleteDir(new File(dir, children[i])); + if (!success) { + return false; + } + } + return dir.delete(); + } else if(dir!= null && dir.isFile()) { + return dir.delete(); + } else { + return false; + } + } public static boolean isGmsInstalled() { try { getContext().getPackageManager().getPackageInfo("com.google.android.gms", 0);