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 203193cdd..0dd8bed82 100644 --- a/app/src/main/java/com/vk/music/stats/VKMusicStatsTracker.java +++ b/app/src/main/java/com/vk/music/stats/VKMusicStatsTracker.java @@ -49,7 +49,7 @@ public final class VKMusicStatsTracker implements MusicStatsTracker { public void b(MusicPlaybackParams musicPlaybackParams) { c.a(a(musicPlaybackParams, "music_start_playback")); - if (Preferences.getBoolValue("sendMusicMetrics", true)) { + if (Preferences.sendMusicMetrics()) { try { makeMetricsRequest(musicPlaybackParams, "music_start_playback"); } catch (JSONException e) { @@ -127,7 +127,7 @@ public final class VKMusicStatsTracker implements MusicStatsTracker { public void a(MusicPlaybackParams musicPlaybackParams) { c.a(a(musicPlaybackParams, "music_stop_playback")); - if (Preferences.getBoolValue("sendMusicMetrics", true)) { + if (Preferences.sendMusicMetrics()) { try { makeMetricsRequest(musicPlaybackParams, "music_stop_playback"); } catch (JSONException e) { diff --git a/app/src/main/java/ru/vtosters/hooks/other/Preferences.java b/app/src/main/java/ru/vtosters/hooks/other/Preferences.java index bcbb03e5e..4e826dc68 100644 --- a/app/src/main/java/ru/vtosters/hooks/other/Preferences.java +++ b/app/src/main/java/ru/vtosters/hooks/other/Preferences.java @@ -292,6 +292,10 @@ public class Preferences { return getBoolValue("vkme_notifs", false); } + public static boolean sendMusicMetrics() { + return getBoolValue("sendMusicMetrics", true); + } + public static boolean screenshotdetect() { return getBoolValue("screenshotdetect", true); } 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..c5ee711d0 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,15 @@ .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 + + return-void + + :cond_228 const/4 v0, 0x2 new-array v0, v0, [Ljava/lang/Object; @@ -224,41 +233,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