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 764b47e26..ffe8dacbb 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 @@ -25,9 +25,6 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment{ } public class openofficialsett implements Preference.OnPreferenceClickListener{ - openofficialsett(){ - } - @Override // android.support.v7.preference.Preference.c public boolean onPreferenceClick(Preference preference){ Context context = getContext(); diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java index c8c214e31..e36e3694b 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java @@ -29,9 +29,6 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment{ } public class restart implements Preference.OnPreferenceClickListener{ - restart(){ - } - @Override public boolean onPreferenceClick(Preference preference){ return InterfaceFragment.this.restart(preference); diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java index 9c0a8ee3b..c003c335d 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java @@ -42,9 +42,6 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment{ } public class restart implements Preference.OnPreferenceClickListener{ - restart(){ - } - @Override public boolean onPreferenceClick(Preference preference){ return MessagesFragment.this.restart(preference); @@ -52,9 +49,6 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment{ } public class clearCache implements Preference.OnPreferenceClickListener{ - clearCache(){ - } - @Override public boolean onPreferenceClick(Preference preference){ return MessagesFragment.this.restart(preference); 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 10553388d..bfec27fab 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 @@ -7,6 +7,7 @@ import static ru.vtosters.lite.utils.CacheUtils.deleteCache; import static ru.vtosters.lite.utils.Globals.getIdentifier; import static ru.vtosters.lite.utils.Globals.getUserToken; import static ru.vtosters.lite.utils.Globals.restartApplication; +import static ru.vtosters.lite.utils.SettBackup.backupOnlines; import static ru.vtosters.lite.utils.SettBackup.backupSettings; import static ru.vtosters.lite.utils.SettBackup.deletePrefs; import static ru.vtosters.lite.utils.SettBackup.restoreBackup; @@ -53,15 +54,13 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment{ findPreference("clearcache").setOnPreferenceClickListener(new e()); findPreference("stickfix").setOnPreferenceClickListener(new f()); findPreference("deleteprefs").setOnPreferenceClickListener(new deleteprefs()); + findPreference("saveonlines").setOnPreferenceClickListener(new onlines()); findPreference("saveprefs").setOnPreferenceClickListener(new saveprefs()); findPreference("restoreprefs").setOnPreferenceClickListener(new restoreprefs()); } public static class d implements Preference.OnPreferenceClickListener{ - d(){ - } - @Override // android.support.v7.preference.Preference.c public boolean onPreferenceClick(Preference preference){ restartApplication(); @@ -69,10 +68,15 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment{ } } - class c implements Preference.OnPreferenceClickListener{ - c(){ + public static class onlines implements Preference.OnPreferenceClickListener{ + @Override // android.support.v7.preference.Preference.c + public boolean onPreferenceClick(Preference preference){ + backupOnlines(); + return true; } + } + class c implements Preference.OnPreferenceClickListener{ public void copy(Context context, String str){ ((ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", str)); makeText(context, Globals.getString("copybtn"), LENGTH_SHORT).show(); @@ -87,9 +91,6 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment{ } public class e implements Preference.OnPreferenceClickListener{ - e(){ - } - @Override // android.support.v7.preference.Preference.c public boolean onPreferenceClick(Preference preference){ SharedPreferences prefs = getContext().getSharedPreferences("stickers", Context.MODE_PRIVATE); @@ -108,10 +109,7 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment{ } } - public class b implements Preference.OnPreferenceClickListener{ - b(){ - } - + public static class b implements Preference.OnPreferenceClickListener{ @Override // android.support.v7.preference.Preference.c public boolean onPreferenceClick(Preference preference){ System.exit(0); @@ -120,9 +118,6 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment{ } public class a implements Preference.OnPreferenceClickListener{ - a(){ - } - @Override // android.support.v7.preference.Preference.c public boolean onPreferenceClick(Preference preference){ VKAccount b = VKAccountManager.d(); @@ -139,9 +134,6 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment{ } public class f implements Preference.OnPreferenceClickListener{ - f(){ - } - @Override // android.support.v7.preference.Preference.c public boolean onPreferenceClick(Preference preference){ SharedPreferences prefs = getContext().getSharedPreferences("stickers", Context.MODE_PRIVATE); @@ -154,10 +146,7 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment{ } } - public class deleteprefs implements Preference.OnPreferenceClickListener{ - deleteprefs(){ - } - + public static class deleteprefs implements Preference.OnPreferenceClickListener{ @Override // android.support.v7.preference.Preference.c public boolean onPreferenceClick(Preference preference){ deletePrefs(); @@ -178,9 +167,6 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment{ } public class restoreprefs implements Preference.OnPreferenceClickListener{ - restoreprefs(){ - } - @Override // android.support.v7.preference.Preference.c public boolean onPreferenceClick(Preference preference){ try { diff --git a/app/src/main/java/ru/vtosters/lite/utils/SettBackup.java b/app/src/main/java/ru/vtosters/lite/utils/SettBackup.java index 0341ddcb6..9e942704a 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/SettBackup.java +++ b/app/src/main/java/ru/vtosters/lite/utils/SettBackup.java @@ -15,7 +15,10 @@ import android.widget.Toast; import java.io.File; import java.io.FileWriter; import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.HashSet; +import java.util.Locale; import java.util.Scanner; import java.util.Set; import java.util.regex.Matcher; @@ -33,6 +36,22 @@ public class SettBackup{ file.delete(); } + public static void backupOnlines(){ + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()); + var dir = new File(getExternalStoragePublicDirectory(DIRECTORY_DOWNLOADS), "/VTLBackups/"); + var file = new File(dir, "Onlines_" + dateFormat.format(new Date()) + ".xml"); + try { + dir.mkdirs(); + FileWriter out = new FileWriter(file); + out.write(getPrefContent("onlines.xml")); + out.close(); + Toast.makeText(getContext(), "Сохранено в файл " + file.getAbsolutePath(), LENGTH_LONG).show(); + } catch (IOException e) { + e.printStackTrace(); + Toast.makeText(getContext(), "Не удалось сохранить файл", LENGTH_SHORT).show(); + } + } + public static void backupSettings(){ // SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()); var dir = new File(getExternalStoragePublicDirectory(DIRECTORY_DOWNLOADS), "/VTLBackups/"); @@ -43,8 +62,9 @@ public class SettBackup{ + ".xml"); try { file.delete(); + dir.mkdirs(); FileWriter out = new FileWriter(file); - out.write(getPrefContent()); + out.write(getPrefContent("com.vtosters.lite_preferences.xml")); out.close(); Toast.makeText(getContext(), "Сохранено в файл " + file.getAbsolutePath(), LENGTH_LONG).show(); } catch (IOException e) { @@ -53,11 +73,11 @@ public class SettBackup{ } } - public static String getPrefContent() throws IOException{ + public static String getPrefContent(String filename) throws IOException{ File prefsDir = new File(getContext().getFilesDir().getParentFile(), "shared_prefs"); if(!prefsDir.exists()) return null; - File pref = new File(prefsDir, "com.vtosters.lite_preferences.xml"); + File pref = new File(prefsDir, filename); return new String(readFileFully(pref)); } diff --git a/smali/res/xml/preferences_other.xml b/smali/res/xml/preferences_other.xml index 4a16fca74..227b71380 100644 --- a/smali/res/xml/preferences_other.xml +++ b/smali/res/xml/preferences_other.xml @@ -34,6 +34,10 @@ android:title="@string/copytokenbtn" /> +