fixed issue with dateformat value

Full date in private messages
Minor improvements
Fixed a bug with anti-deletion of messages

app/src/main/java/ru/vtosters/lite/utils/Globals.java

@@ -22,6 +22,7 @@ import android.util.Log;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
 
 import com.vtosters.lite.UserProfile;
 import com.vtosters.lite.VKActivity;
@@ -143,6 +144,10 @@ public class Globals {
         return getContext().getString(getIdentifier(resourcename, "string"));
     } // Get string via getIdentifier
 
+    public static String getStringDate(@StringRes int i, Object... objArr) {
+        return getContext().getString(i, objArr);
+    }
+
     public static String getPackageName() {
         return getContext().getPackageName();
     }

app/src/main/java/ru/vtosters/lite/utils/JsonInjectors.java

@@ -39,14 +39,14 @@ public class JsonInjectors {
 
     public static String haveDonateBanner() {
         Random random = new Random();
-        int randomshower = random.nextInt(7);
+        int randomshower = random.nextInt(8);
 
         return hasVerification() || donaterecomm() || randomshower != 1 ? "null" : "info";
     }
 
     public static String haveDonateButton() {
         Random random = new Random();
-        int randomshower = random.nextInt(7);
+        int randomshower = random.nextInt(10);
 
         return hasVerification() || donaterecomm() || randomshower != 1 ? "null" : "buttons";
     }

app/src/main/java/ru/vtosters/lite/utils/Preferences.java

@@ -5,7 +5,10 @@ import static ru.vtosters.lite.ui.fragments.multiaccount.MultiAccountManager.mig
 import static ru.vtosters.lite.utils.DeletedMessagesHandler.reloadMessagesList;
 import static ru.vtosters.lite.utils.Globals.fixGapps;
 import static ru.vtosters.lite.utils.Globals.getContext;
+import static ru.vtosters.lite.utils.Globals.getIdentifier;
 import static ru.vtosters.lite.utils.Globals.getPrefsValue;
+import static ru.vtosters.lite.utils.Globals.getString;
+import static ru.vtosters.lite.utils.Globals.getStringDate;
 import static ru.vtosters.lite.utils.Globals.getUserId;
 import static ru.vtosters.lite.utils.Globals.registerActivities;
 import static ru.vtosters.lite.utils.Newsfeed.setupFilters;
@@ -20,8 +23,11 @@ import android.os.Build;
 import android.preference.PreferenceManager;
 
 import com.vk.core.util.Screen;
+import com.vk.im.engine.models.users.UserSex;
 import com.vtosters.lite.data.Users;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Locale;
 
 public class Preferences {
@@ -181,10 +187,6 @@ public class Preferences {
         setupFilters();
     }
 
-    public static boolean fulltime() {
-        return getBoolValue("fulltime", true);
-    }
-
     public static boolean gcmfix() {
         return getBoolValue("gcmfix", true);
     }
@@ -367,4 +369,35 @@ public class Preferences {
 
         return string.isEmpty() ? Locale.getDefault().getLanguage() : string;
     }
+
+
+    public static boolean fulltime() {
+        return getPrefsValue("dateformat").equals("noyear") || getPrefsValue("dateformat").equals("full") || getPrefsValue("dateformat").equals("noseconds");
+    }
+
+    public static String getDateFormat() {
+        if (getPrefsValue("dateformat").equals("noyear")) {
+            return getString("fulltime2");
+        }
+
+        if (getPrefsValue("dateformat").equals("full")) {
+            return getString("fulltime");
+        }
+
+        return getString("fulltime3");
+    }
+
+    public static String getFormattedDate(UserSex type, long time){
+        SimpleDateFormat date = new SimpleDateFormat(getDateFormat(), Locale.getDefault());
+
+        if(!fulltime()) return null;
+
+        try {
+            return getStringDate(type == UserSex.FEMALE ? getIdentifier("last_seen_profile_f", "string") : getIdentifier("last_seen_profile_m", "string"), new Object[]{date.format(new Date(time))});
+
+        } catch (Throwable th) {
+            th.printStackTrace();
+            return null;
+        }
+    }
 }

smali/res/layout/view_modern_search.xml

@@ -20,11 +20,11 @@
             android:layout_height="48.0dip"
             android:src="@drawable/ic_back_24"
             android:scaleType="centerInside"
-            android:tint="#ff909499" />
+            android:tint="?text_primary" />
 
         <com.vk.core.view.NoMenuEditText
             android:textSize="16.0dip"
-            android:textColor="#ff000000"
+            android:textColor="?header_text"
             android:textColorHint="#ffaaaeb3"
             android:gravity="center_vertical"
             android:id="@id/query"
@@ -41,7 +41,7 @@
 
         <TextView
             android:textSize="16.0dip"
-            android:textColor="#ff000000"
+            android:textColor="?header_text"
             android:textColorHint="#ffaaaeb3"
             android:ellipsize="end"
             android:gravity="center_vertical"
@@ -74,6 +74,6 @@
             android:layout_height="40.0dip"
             android:src="@drawable/ic_cancel_24"
             android:scaleType="centerInside"
-            android:tint="#ff909499" />
+            android:tint="?header_text" />
     </LinearLayout>
 </merge>

smali/res/values-ru/arrays.xml

@@ -505,4 +505,10 @@
         <item>🗑</item>
         <item>❌</item>
     </string-array>
+    <string-array name="dateformat_value">
+        <item>По умолчанию</item>
+        <item>15 апреля в 18:42</item>
+        <item>15 апреля в 18:42:28</item>
+        <item>15 апреля 2022 в 18:42:28</item>
+    </string-array>
 </resources>

smali/res/values-ru/strings.xml

@@ -4064,6 +4064,8 @@
     <string name="vtlnavbar">Покрасить панель навигации</string>
     <string name="donate">Помочь проекту</string>
     <string name="fulltime">dd MMMM yyyy в HH:mm:ss</string>
+    <string name="fulltime2">dd MMMM в HH:mm:ss</string>
+    <string name="fulltime3">dd MMMM в HH:mm</string>
     <string name="vtlsfiltershort">"Фильтр коротких ссылок "</string>
     <string name="vtlsfiltershortsummary">"Фильтр для блокировки постов с короткими ссылками, такими как bit.ly или cutt.ly
 Этот фильтр не затрагивает ссылки vk.cc"</string>
@@ -4439,5 +4441,7 @@
 
     <string name="roundedmsgs">Круглые сообщения</string>
 
+    <string name="dateformat">Выберите тип показа дат</string>
+
     <string name="empty_text" />
 </resources>

smali/res/values-v31/styles.xml

@@ -1611,8 +1611,7 @@
         <item name="im_history_image_bubbleless_border">#1e000000</item>
         <item name="im_history_incoming_attachment_icon">?accent</item>
         <item name="im_history_incoming_background">@android:color/system_neutral1_50</item>
-        <item name="im_history_incoming_background_selected">@android:color/system_accent1_400
+        <item name="im_history_incoming_background_selected">@android:color/system_accent1_100</item>
-        </item>
         <item name="im_history_incoming_button">?accent</item>
         <item name="im_history_incoming_foreground">@color/black</item>
         <item name="im_history_incoming_foreground_caption">@color/im_old_gray_medium</item>
@@ -1620,26 +1619,21 @@
         <item name="im_history_incoming_foreground_link">?accent</item>
         <item name="im_history_incoming_foreground_name">?accent</item>
         <item name="im_history_incoming_image_placeholder_background">#14000c1a</item>
-        <item name="im_history_incoming_snippet_placeholder_background">
+        <item name="im_history_incoming_snippet_placeholder_background">@android:color/system_accent1_1000</item>
-            @android:color/system_accent1_1000
-        </item>
         <item name="im_history_incoming_snippet_placeholder_icon">?accent</item>
         <item name="im_history_info_bar_background">#fffafbfc</item>
         <item name="im_history_info_bar_border">#26000000</item>
         <item name="im_history_live_badge_background">#ffff3347</item>
         <item name="im_history_outgoing_attachment_icon">?accent</item>
-        <item name="im_history_outgoing_background">@android:color/system_accent2_100</item>
+        <item name="im_history_outgoing_background">@android:color/system_accent2_50</item>
-        <item name="im_history_outgoing_background_selected">@android:color/system_accent1_800
+        <item name="im_history_outgoing_background_selected">@android:color/system_neutral2_100</item>
-        </item>
         <item name="im_history_outgoing_button">?accent</item>
         <item name="im_history_outgoing_foreground">@color/black</item>
         <item name="im_history_outgoing_foreground_caption">@color/im_old_gray_medium</item>
         <item name="im_history_outgoing_foreground_link">@android:color/system_accent1_900</item>
         <item name="im_history_outgoing_foreground_name">@android:color/system_accent1_900</item>
         <item name="im_history_outgoing_image_placeholder_background">#14000c1a</item>
-        <item name="im_history_outgoing_snippet_placeholder_background">
+        <item name="im_history_outgoing_snippet_placeholder_background">@android:color/system_accent1_1000</item>
-            @android:color/system_accent1_1000
-        </item>
         <item name="im_history_outgoing_snippet_placeholder_icon">?accent</item>
         <item name="im_history_sending_icon">?accent</item>
         <item name="im_history_sticker_badge_background">#e6ffffff</item>
@@ -1912,8 +1906,8 @@
         <item name="im_history_info_bar_border">#26000000</item>
         <item name="im_history_live_badge_background">#ffff3347</item>
         <item name="im_history_outgoing_attachment_icon">?accent</item>
-        <item name="im_history_outgoing_background">@android:color/system_neutral1_800</item>
+        <item name="im_history_outgoing_background">@android:color/system_accent2_700</item>
-        <item name="im_history_outgoing_background_selected">@android:color/system_accent1_500</item>
+        <item name="im_history_outgoing_background_selected">@android:color/system_neutral2_800</item>
         <item name="im_history_outgoing_button">?accent</item>
         <item name="im_history_outgoing_foreground">@color/black</item>
         <item name="im_history_outgoing_foreground_caption">@color/im_old_gray_medium</item>
@@ -2190,8 +2184,8 @@
         <item name="im_history_info_bar_border">#26000000</item>
         <item name="im_history_live_badge_background">#ffff3347</item>
         <item name="im_history_outgoing_attachment_icon">?accent</item>
-        <item name="im_history_outgoing_background">@android:color/system_neutral1_800</item>
+        <item name="im_history_outgoing_background">@android:color/system_accent2_700</item>
-        <item name="im_history_outgoing_background_selected">@android:color/system_accent1_500</item>
+        <item name="im_history_outgoing_background_selected">@android:color/system_neutral2_800</item>
         <item name="im_history_outgoing_button">?accent</item>
         <item name="im_history_outgoing_foreground">@color/black</item>
         <item name="im_history_outgoing_foreground_caption">@color/im_old_gray_medium</item>

smali/res/values/arrays.xml

@@ -706,4 +706,16 @@
         <item>icon</item>
         <item>icon2</item>
     </string-array>
+    <string-array name="dateformat_value">
+        <item>Default</item>
+        <item>15 april 18:42</item>
+        <item>15 april 18:42:28</item>
+        <item>15 april 2022 18:42:28</item>
+    </string-array>
+    <string-array name="dateformat">
+        <item>default</item>
+        <item>noseconds</item>
+        <item>noyear</item>
+        <item>full</item>
+    </string-array>
 </resources>

smali/res/values/strings.xml

@@ -4189,6 +4189,8 @@ Filters are case-sensitive!"</string>
     <string name="vtlnavbar">Color navigation bar</string>
     <string name="donate">Donate</string>
     <string name="fulltime">dd MMMM yyyy HH:mm:ss</string>
+    <string name="fulltime2">dd MMMM HH:mm:ss</string>
+    <string name="fulltime3">dd MMMM HH:mm</string>
     <string name="vtlsfiltershort">Short link filter</string>
     <string name="vtlsfiltershortsummary">"Blocks posts containing short links, such as bit.ly or cutt.ly
 Does not affect vk.cc links"</string>
@@ -4573,6 +4575,8 @@ May look like a fake leaving the online"</string>
 
     <string name="roundedmsgs">Rounded messages</string>
 
+    <string name="dateformat">Select the date display type</string>
+
     <item type="string" name="APKTOOL_DUMMY_10be" />
     <item type="string" name="APKTOOL_DUMMY_10bf" />
     <item type="string" name="APKTOOL_DUMMY_10c0" />

smali/res/values/styles.xml

@@ -7070,7 +7070,7 @@
         <item name="im_msg_box_margin_start_with_avatar">8.0dip</item>
         <item name="im_msg_list_add_duration">0</item>
         <item name="im_msg_part_corner_radius_big">14.0dip</item>
-        <item name="im_msg_part_corner_radius_small">6.0dip</item>
+        <item name="im_msg_part_corner_radius_small">14.0dip</item>
         <item name="im_msg_part_label_contrast_bg">@drawable/vkim_msg_part_label_contrast_bg_new</item>
         <item name="im_msg_part_time_contrast_bg">@drawable/vkim_msg_part_time_contrast_bg_new</item>
         <item name="im_msg_part_time_sticker_bg">@drawable/vkim_msg_part_time_sticker_bg_new</item>

smali/res/xml/preferences_activity.xml

@@ -5,7 +5,7 @@
             android:defaultValue="default"
             android:dialogTitle="@string/activity_undel_dial"
             android:entries="@array/undel_value"
-            android:entryValues="@array/undel"
+            android:entryValues="@array/undel_value"
             android:key="undeletemsg_prefix_value"
             android:title="@string/activity_undel_tag" />
         <com.vtosters.lite.ui.MaterialSwitchPreference

smali/res/xml/preferences_interface.xml

@@ -25,16 +25,18 @@
             android:entryValues="@array/start_values"
             android:key="start_values"
             android:title="@string/interfacestartfr" />
+        <com.vtosters.lite.ui.SummaryListPreference
+            android:defaultValue="default"
+            android:dialogTitle="@string/dateformat"
+            android:entries="@array/dateformat_value"
+            android:entryValues="@array/dateformat"
+            android:key="dateformat"
+            android:title="@string/interfaceglobaldates" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="false"
             android:key="olddock"
             android:summary="@string/interface_global_old_icons_summary"
             android:title="@string/interface_global_old_icons" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="fulltime"
-            android:summary="@string/interfaceglobaldatessum"
-            android:title="@string/interfaceglobaldates" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="true"
             android:key="shortinfo"

smali/smali/com/vk/im/ui/components/attaches_history/attaches/adapter/delegates/DocAttachViewTypeDelegate.smali

@@ -52,11 +52,9 @@
     iput-object v0, p0, Lcom/vk/im/ui/components/attaches_history/attaches/adapter/delegates/DocAttachViewTypeDelegate;->b:Lcom/vk/im/ui/formatters/FileSizeFormatter;
 
     .line 28
-    new-instance p1, Ljava/text/SimpleDateFormat;
+    invoke-static {}, Lru/vtosters/lite/utils/Preferences;->setDateFormat()Ljava/text/SimpleDateFormat;
 
-    const-string v0, "dd MMMM HH:mm"
+    move-result-object p1
-
-    invoke-direct {p1, v0}, Ljava/text/SimpleDateFormat;-><init>(Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/vk/im/ui/components/attaches_history/attaches/adapter/delegates/DocAttachViewTypeDelegate;->c:Ljava/text/SimpleDateFormat;
 

smali/smali/com/vk/im/ui/formatters/lastseen/LastSeenFormatter.smali

@@ -510,6 +510,16 @@
 .method public final a(Lcom/vk/im/engine/models/users/UserSex;J)Ljava/lang/String;
     .locals 2
 
+    invoke-static {p1, p2, p3}, Lru/vtosters/lite/utils/Preferences;->getFormattedDate(Lcom/vk/im/engine/models/users/UserSex;J)Ljava/lang/String;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    return-object v0
+
+    .line 1
+    :cond_1
     const-string v0, "userSex"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->b(Ljava/lang/Object;Ljava/lang/String;)V

smali/smali/com/vtosters/lite/VKApplication.smali

@@ -731,7 +731,7 @@
 
     move-result v0
 
-    if-nez v0, :cond_0
+    if-eqz v0, :cond_0
 
     .line 18
     new-instance v0, Ljava/util/Date;
@@ -1531,15 +1531,7 @@
 
     new-instance v0, Ljava/text/SimpleDateFormat;
 
-    sget-object v3, Lcom/vk/core/util/AppContextHolder;->a:Landroid/content/Context;
+    invoke-static {}, Lru/vtosters/lite/utils/Preferences;->getDateFormat()Ljava/lang/String;
-
-    invoke-virtual {v3}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v3
-
-    const p0, 0x7f11100f
-
-    invoke-virtual {v3, p0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 

smali/smali_classes4/com/vk/im/ui/views/ScrollToBottomView.smali

@@ -106,8 +106,21 @@
 .end method
 
 .method private static a(I)Ljava/lang/CharSequence;
-    .locals 2
+    .locals 3
 
+    invoke-static {}, Lru/vtosters/lite/utils/Preferences;->shortinfo()Z
+
+    move-result v1
+
+    if-nez v1, :cond_2
+
+    invoke-static {p0}, Ljava/lang/Integer;->toString(I)Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_2
     const v0, 0xf4240
 
     if-lt p0, v0, :cond_0

smali/smali_classes5/com/vk/newsfeed/holders/attachments/SnippetHolder.smali

@@ -418,6 +418,19 @@
 .method private final a(I)Ljava/lang/String;
     .locals 4
 
+    invoke-static {}, Lru/vtosters/lite/utils/Preferences;->shortinfo()Z
+
+    move-result v1
+
+    if-nez v1, :cond_2
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_2
     const v0, 0x989680
 
     if-le p1, v0, :cond_0