From cc6e3c2dd8e0efa31cfb0e117a240e5c6190e58e Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Thu, 11 Aug 2022 22:29:11 +0300 Subject: [PATCH] fix bug --- .../vtosters/lite/ui/vkui/VBListBuilder.java | 5 +- .../com/vk/core/util/TimeUtils.smali | 53 +++++++++++++++++-- .../com/vtosters/lite/VKApplication.smali | 52 ------------------ 3 files changed, 51 insertions(+), 59 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/ui/vkui/VBListBuilder.java b/app/src/main/java/ru/vtosters/lite/ui/vkui/VBListBuilder.java index 8a2220250..5d2c44118 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/vkui/VBListBuilder.java +++ b/app/src/main/java/ru/vtosters/lite/ui/vkui/VBListBuilder.java @@ -5,10 +5,9 @@ import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr; import android.content.Context; import android.util.TypedValue; import android.view.ViewGroup; +import android.widget.CheckBox; import android.widget.LinearLayout; -import androidx.appcompat.widget.AppCompatCheckBox; - import java.util.List; public class VBListBuilder{ @@ -18,7 +17,7 @@ public class VBListBuilder{ mainView.setPadding(dp2px(8f), 0, dp2px(8f), 0); for (VBListItem item : items) { - AppCompatCheckBox mcb = new AppCompatCheckBox(ctx, null); + CheckBox mcb = new CheckBox(ctx, null); mcb.setPadding(0, dp2px(8f), 0, dp2px(8f)); mcb.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14f); diff --git a/smali/smali_classes2/com/vk/core/util/TimeUtils.smali b/smali/smali_classes2/com/vk/core/util/TimeUtils.smali index 47e673eb1..989247ef9 100644 --- a/smali/smali_classes2/com/vk/core/util/TimeUtils.smali +++ b/smali/smali_classes2/com/vk/core/util/TimeUtils.smali @@ -18,7 +18,6 @@ .field private static final c:[J - # direct methods .method static constructor ()V .locals 1 @@ -438,7 +437,7 @@ move/from16 v0, p0 - invoke-static {v0}, Lcom/vtosters/lite/VKApplication;->getFullTime(I)Ljava/lang/String; + invoke-static {v0}, Lcom/vk/core/util/TimeUtils;->getFullTime(I)Ljava/lang/String; move-result-object v0 @@ -1450,7 +1449,7 @@ .method public static b(ILandroid/content/res/Resources;)Ljava/lang/String; .locals 4 - invoke-static {p0}, Lcom/vtosters/lite/VKApplication;->getFullTime(I)Ljava/lang/String; + invoke-static {p0}, Lcom/vk/core/util/TimeUtils;->getFullTime(I)Ljava/lang/String; move-result-object v0 @@ -1567,6 +1566,52 @@ return-object p0 .end method +.method public static getFullTime(I)Ljava/lang/String; + .registers 6 + .param p0, "s" # I + + .line 17 + invoke-static {}, Lru/vtosters/lite/hooks/DateHook;->fulltime()Z + + move-result v0 + + if-eqz v0, :cond_17 + + .line 18 + new-instance v0, Ljava/util/Date; + + int-to-long v1, p0 + + const-wide/16 v3, 0x3e8 + + mul-long v1, v1, v3 + + invoke-direct {v0, v1, v2}, Ljava/util/Date;->(J)V + + .line 19 + .local v0, "d":Ljava/util/Date; + new-instance v1, Ljava/text/SimpleDateFormat; + + invoke-static {}, Lru/vtosters/lite/hooks/DateHook;->getDateFormat()Ljava/lang/String; + + move-result-object v3 + + invoke-direct {v1, v3}, Ljava/text/SimpleDateFormat;->(Ljava/lang/String;)V + + invoke-virtual {v1, v0}, Ljava/text/SimpleDateFormat;->format(Ljava/util/Date;)Ljava/lang/String; + + move-result-object v1 + + return-object v1 + + .line 21 + .end local v0 # "d":Ljava/util/Date; + :cond_17 + const/4 v0, 0x0 + + return-object v0 +.end method + .method public static b(IZZ)Ljava/lang/String; .locals 15 @@ -1576,7 +1621,7 @@ move/from16 v0, p0 - invoke-static {v0}, Lcom/vtosters/lite/VKApplication;->getFullTime(I)Ljava/lang/String; + invoke-static {v0}, Lcom/vk/core/util/TimeUtils;->getFullTime(I)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes4/com/vtosters/lite/VKApplication.smali b/smali/smali_classes4/com/vtosters/lite/VKApplication.smali index 50da9badb..ec40f57d9 100644 --- a/smali/smali_classes4/com/vtosters/lite/VKApplication.smali +++ b/smali/smali_classes4/com/vtosters/lite/VKApplication.smali @@ -14,8 +14,6 @@ # static fields .field private static a:Z -.field private static final formatoftime:Ljava/text/SimpleDateFormat; - # direct methods .method static constructor ()V .locals 2 @@ -3005,59 +3003,9 @@ .line 48 sput-boolean v7, Lcom/vtosters/lite/VKApplication;->a:Z - new-instance v0, Ljava/text/SimpleDateFormat; - - invoke-static {}, Lru/vtosters/lite/hooks/DateHook;->getDateFormat()Ljava/lang/String; - - move-result-object v3 - - invoke-direct {v0, v3}, Ljava/text/SimpleDateFormat;->(Ljava/lang/String;)V - - sput-object v0, Lcom/vtosters/lite/VKApplication;->formatoftime:Ljava/text/SimpleDateFormat; - return-void .end method -.method public static getFullTime(I)Ljava/lang/String; - .registers 6 - .param p0, "s" # I - - .line 17 - invoke-static {}, Lru/vtosters/lite/hooks/DateHook;->fulltime()Z - - move-result v0 - - if-eqz v0, :cond_17 - - .line 18 - new-instance v0, Ljava/util/Date; - - int-to-long v1, p0 - - const-wide/16 v3, 0x3e8 - - mul-long v1, v1, v3 - - invoke-direct {v0, v1, v2}, Ljava/util/Date;->(J)V - - .line 19 - .local v0, "d":Ljava/util/Date; - sget-object v1, Lcom/vtosters/lite/VKApplication;->formatoftime:Ljava/text/SimpleDateFormat; - - invoke-virtual {v1, v0}, Ljava/text/SimpleDateFormat;->format(Ljava/util/Date;)Ljava/lang/String; - - move-result-object v1 - - return-object v1 - - .line 21 - .end local v0 # "d":Ljava/util/Date; - :cond_17 - const/4 v0, 0x0 - - return-object v0 -.end method - .method public onLowMemory()V .locals 2