From eb4f0be29a6b351c3f5cc0346ae25570b091709d Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Sun, 24 Mar 2024 20:15:52 +0300 Subject: [PATCH] smali fixes --- .../vk/music/stats/VKMusicStatsTracker.java | 2 +- .../music/injectors/CatalogJsonInjector.java | 4 ++ .../vk/api/audio/AudioSendStartEvent.smali | 36 ++++++------ .../MusicRestrictionModelImpl.smali | 55 ++++++++++++------- 4 files changed, 59 insertions(+), 38 deletions(-) diff --git a/app/src/main/java/com/vk/music/stats/VKMusicStatsTracker.java b/app/src/main/java/com/vk/music/stats/VKMusicStatsTracker.java index e4a586f7b..ae244f510 100644 --- a/app/src/main/java/com/vk/music/stats/VKMusicStatsTracker.java +++ b/app/src/main/java/com/vk/music/stats/VKMusicStatsTracker.java @@ -241,7 +241,7 @@ public final class VKMusicStatsTracker implements MusicStatsTracker { String builder = String.format("API.stats.trackEvents(%s);", new JSONObject().put("events", eventsArray)); Metrics.trackEvents(builder); - Metrics.sendStartEvent(musicPlaybackParams.c(), DeviceIdProvider.d(AndroidUtils.getGlobalContext())); +// Metrics.sendStartEvent(musicPlaybackParams.c(), DeviceIdProvider.d(AndroidUtils.getGlobalContext())); } private Analytics.l a(MusicPlaybackParams musicPlaybackParams, String str) { diff --git a/app/src/main/java/ru/vtosters/hooks/music/injectors/CatalogJsonInjector.java b/app/src/main/java/ru/vtosters/hooks/music/injectors/CatalogJsonInjector.java index b45260887..543d8fcda 100644 --- a/app/src/main/java/ru/vtosters/hooks/music/injectors/CatalogJsonInjector.java +++ b/app/src/main/java/ru/vtosters/hooks/music/injectors/CatalogJsonInjector.java @@ -46,6 +46,10 @@ public class CatalogJsonInjector { fetchCatalogId("https://vk.com/audio?section=albums", oldItems); + if (Preferences.sendMusicMetrics()) { + fetchCatalogId("https://vk.com/audio?section=recent", oldItems); + } + setDefaultAudioPage(oldItems, catalog); } diff --git a/smali/smali_classes2/com/vk/api/audio/AudioSendStartEvent.smali b/smali/smali_classes2/com/vk/api/audio/AudioSendStartEvent.smali index 4ac0f3696..dfb2c34fa 100644 --- a/smali/smali_classes2/com/vk/api/audio/AudioSendStartEvent.smali +++ b/smali/smali_classes2/com/vk/api/audio/AudioSendStartEvent.smali @@ -40,31 +40,33 @@ .method public a(Lorg/json/JSONObject;)Lcom/vk/dto/music/CurrentAccountInformation; .locals 1 - const-string v0, "response" + # const-string v0, "response" - .line 2 - invoke-virtual {p1, v0}, Lorg/json/JSONObject;->getJSONObject(Ljava/lang/String;)Lorg/json/JSONObject; + # .line 2 + # invoke-virtual {p1, v0}, Lorg/json/JSONObject;->getJSONObject(Ljava/lang/String;)Lorg/json/JSONObject; - move-result-object p1 + # move-result-object p1 - const-string v0, "has_music_subscription" + # const-string v0, "has_music_subscription" - .line 3 - invoke-virtual {p1, v0}, Lorg/json/JSONObject;->optInt(Ljava/lang/String;)I + # .line 3 + # invoke-virtual {p1, v0}, Lorg/json/JSONObject;->optInt(Ljava/lang/String;)I - move-result p1 + # move-result p1 + # const/4 v0, 0x1 + + # if-ne p1, v0, :cond_0 + + # goto :goto_0 + + # :cond_0 + # const/4 v0, 0x1 + + # .line 4 + # :goto_0 const/4 v0, 0x1 - if-ne p1, v0, :cond_0 - - goto :goto_0 - - :cond_0 - const/4 v0, 0x1 - - .line 4 - :goto_0 new-instance p1, Lcom/vk/dto/music/CurrentAccountInformation; invoke-direct {p1, v0}, Lcom/vk/dto/music/CurrentAccountInformation;->(Z)V diff --git a/smali/smali_classes3/com/vk/music/notifications/restriction/MusicRestrictionModelImpl.smali b/smali/smali_classes3/com/vk/music/notifications/restriction/MusicRestrictionModelImpl.smali index 58ac6c955..dd16e6c09 100644 --- a/smali/smali_classes3/com/vk/music/notifications/restriction/MusicRestrictionModelImpl.smali +++ b/smali/smali_classes3/com/vk/music/notifications/restriction/MusicRestrictionModelImpl.smali @@ -196,6 +196,21 @@ .method public a(Lcom/vk/dto/music/MusicTrack;)V .locals 3 + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->sendMusicMetrics()Z + + move-result v1 + + if-nez v1, :cond_228 + + const/4 v0, 0x1 + + new-instance p1, Lcom/vk/dto/music/CurrentAccountInformation; + + invoke-direct {p1, v0}, Lcom/vk/dto/music/CurrentAccountInformation;->(Z)V + + return-void + + :cond_228 const/4 v0, 0x2 new-array v0, v0, [Ljava/lang/Object; @@ -224,41 +239,41 @@ .line 14 :cond_0 - # new-instance v0, Lcom/vk/api/audio/AudioSendStartEvent; + new-instance v0, Lcom/vk/api/audio/AudioSendStartEvent; - # invoke-virtual {p1}, Lcom/vk/dto/music/MusicTrack;->y1()Ljava/lang/String; + invoke-virtual {p1}, Lcom/vk/dto/music/MusicTrack;->y1()Ljava/lang/String; - # move-result-object p1 + move-result-object p1 - # sget-object v2, Lcom/vk/api/base/ApiConfig;->d:Lcom/vk/api/base/ApiConfig$a; + sget-object v2, Lcom/vk/api/base/ApiConfig;->d:Lcom/vk/api/base/ApiConfig$a; - # invoke-interface {v2}, Lcom/vk/api/base/ApiConfig$a;->O1()Ljava/lang/String; + invoke-interface {v2}, Lcom/vk/api/base/ApiConfig$a;->O1()Ljava/lang/String; - # move-result-object v2 + move-result-object v2 - # invoke-direct {v0, p1, v2}, Lcom/vk/api/audio/AudioSendStartEvent;->(Ljava/lang/String;Ljava/lang/String;)V + invoke-direct {v0, p1, v2}, Lcom/vk/api/audio/AudioSendStartEvent;->(Ljava/lang/String;Ljava/lang/String;)V - # const/4 p1, 0x0 + const/4 p1, 0x0 - # .line 15 - # invoke-static {v0, p1, v1, p1}, Lcom/vk/api/base/ApiRequest;->d(Lcom/vk/api/base/ApiRequest;Lcom/vk/api/base/ApiThreadHolder;ILjava/lang/Object;)Lio/reactivex/Observable; + .line 15 + invoke-static {v0, p1, v1, p1}, Lcom/vk/api/base/ApiRequest;->d(Lcom/vk/api/base/ApiRequest;Lcom/vk/api/base/ApiThreadHolder;ILjava/lang/Object;)Lio/reactivex/Observable; - # move-result-object p1 + move-result-object p1 - # .line 16 - # new-instance v0, Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl$d; + .line 16 + new-instance v0, Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl$d; - # invoke-direct {v0, p0}, Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl$d;->(Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl;)V + invoke-direct {v0, p0}, Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl$d;->(Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl;)V - # .line 17 - # sget-object v1, Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl$e;->a:Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl$e; + .line 17 + sget-object v1, Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl$e;->a:Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl$e; - # .line 18 - # invoke-virtual {p1, v0, v1}, Lio/reactivex/Observable;->a(Lio/reactivex/functions/Consumer;Lio/reactivex/functions/Consumer;)Lio/reactivex/disposables/Disposable; + .line 18 + invoke-virtual {p1, v0, v1}, Lio/reactivex/Observable;->a(Lio/reactivex/functions/Consumer;Lio/reactivex/functions/Consumer;)Lio/reactivex/disposables/Disposable; - # move-result-object p1 + move-result-object p1 - # iput-object p1, p0, Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl;->a:Lio/reactivex/disposables/Disposable; + iput-object p1, p0, Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl;->a:Lio/reactivex/disposables/Disposable; return-void .end method