From fe5616b3f70ceceaca2feceb1922e3ad9b987003 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Thu, 16 Jun 2022 01:06:11 +0300
Subject: [PATCH] fixes
---
.../ru/vtosters/lite/downloaders/OTADownloader.java | 5 +++--
.../java/ru/vtosters/lite/ui/dialogs/OTADialog.java | 4 +++-
.../vtosters/lite/ui/fragments/MessagesFragment.java | 4 ++++
.../vtosters/lite/ui/vkui/ModalBottomSheetWrapper.java | 8 ++++----
smali/res/values-ru/strings.xml | 6 ++++++
smali/res/values/strings.xml | 5 +++++
smali/res/xml/preferences_general.xml | 10 ----------
smali/res/xml/preferences_messages.xml | 9 ++++-----
8 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/OTADownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/OTADownloader.java
index 6171d2e61..674684466 100644
--- a/app/src/main/java/ru/vtosters/lite/downloaders/OTADownloader.java
+++ b/app/src/main/java/ru/vtosters/lite/downloaders/OTADownloader.java
@@ -1,5 +1,7 @@
package ru.vtosters.lite.downloaders;
+import static ru.vtosters.lite.utils.Globals.getString;
+
import android.app.DownloadManager;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -46,7 +48,7 @@ public class OTADownloader {
File apk = maxIndex == -1 ? new File(downloadDir, "VTLite.apk") : new File(downloadDir, "VTLite-" + maxIndex + ".apk");
APKInstallActivity.installOta(context, FileUtils.h(apk));
} else if (status == DownloadManager.STATUS_FAILED) {
- // do something
+ Globals.sendToast(getString("downloaderr"));
}
}
}
@@ -54,7 +56,6 @@ public class OTADownloader {
public static void downloadBuild(String url) {
var context = Globals.getContext();
- url = "https://github.com/vtosters/lite/releases/download/v0.2.9-beta2/VTLite.apk";
var uri = Uri.parse(url);
context.registerReceiver(callback, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java
index 98780d2cd..471353476 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java
@@ -1,5 +1,7 @@
package ru.vtosters.lite.ui.dialogs;
+import static ru.vtosters.lite.utils.Globals.getString;
+
import android.app.Activity;
import ru.vtosters.lite.downloaders.OTADownloader;
@@ -29,7 +31,7 @@ public class OTADialog implements OTAHelper.OTAListener {
// Toast.makeText(mActivity, "Обновления найдены", Toast.LENGTH_SHORT).show();
new ModalBottomSheetWrapper(mActivity)
.setUpdateInfoView(mHelper.getNewVersionName(), mHelper.getUpdateDescription())
- .setPositiveButton("Обновить", () -> {
+ .setPositiveButton(getString("updateanddownload"), () -> {
OTADownloader.downloadBuild(mHelper.getDownloadUrl());
})
.show();
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 172552a6c..b57c3e2e9 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
@@ -18,6 +18,10 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
private void prefs() {
a("vkme").a(new MessagesFragment.restart());
+ a("vkme_notifs").a(new MessagesFragment.restart());
+ a("isBGStickersEnabled").a(new MessagesFragment.restart());
+ a("roundedmsgs").a(new MessagesFragment.restart());
+ a("systememoji").a(new MessagesFragment.restart());
}
public boolean restart(Preference preference, Object obj) {
diff --git a/app/src/main/java/ru/vtosters/lite/ui/vkui/ModalBottomSheetWrapper.java b/app/src/main/java/ru/vtosters/lite/ui/vkui/ModalBottomSheetWrapper.java
index 8fe60119b..1670507e5 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/vkui/ModalBottomSheetWrapper.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/vkui/ModalBottomSheetWrapper.java
@@ -1,9 +1,9 @@
package ru.vtosters.lite.ui.vkui;
+import static ru.vtosters.lite.utils.Globals.getString;
+
import android.app.Activity;
-import android.content.Context;
import android.graphics.Typeface;
-import android.util.TypedValue;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -33,7 +33,7 @@ public class ModalBottomSheetWrapper {
container.setOrientation(LinearLayout.VERTICAL);
- title.setText("Новая версия " + version);
+ title.setText(getString("newversion") + " " + version);
title.setTypeface(title.getTypeface(), Typeface.BOLD);
title.setSingleLine(true);
title.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
@@ -42,7 +42,7 @@ public class ModalBottomSheetWrapper {
container.addView(title, new LinearLayout.LayoutParams(-1, -2));
changelogView.setPadding(0, Globals.convertDpToPixel(8), 0, 0);
- changelogView.setText("Изменения: \n" + changelog);
+ changelogView.setText(getString("changelog") + ": \n" + changelog);
changelogView.setTextColor(Themes.getTextAttr());
container.addView(changelogView, new LinearLayout.LayoutParams(-1, -2));
diff --git a/smali/res/values-ru/strings.xml b/smali/res/values-ru/strings.xml
index 731a9eb8f..d3f8bda20 100644
--- a/smali/res/values-ru/strings.xml
+++ b/smali/res/values-ru/strings.xml
@@ -4477,5 +4477,11 @@
Авто обновления
Обновления
+ Вернуть вкладку уведомлений
+ Обновить
+ Новая версия
+ Список изменений
+ Ошибка загрузки файла
+
diff --git a/smali/res/values/strings.xml b/smali/res/values/strings.xml
index df4a31456..ce0412e82 100644
--- a/smali/res/values/strings.xml
+++ b/smali/res/values/strings.xml
@@ -4611,6 +4611,11 @@ May look like a fake leaving the online"
Auto updates
Updates
+ Back notification tab to dock
+ Update
+ New version
+ Changelog
+ Download error