From a073314c28108fade4b2b5c959142ca020580d1b Mon Sep 17 00:00:00 2001 From: aliveoutside <53598473+aliveoutside@users.noreply.github.com> Date: Fri, 15 Jul 2022 01:59:16 +0300 Subject: [PATCH] fix vkx integration --- .../libvkx/client/LibVKXBoomModel.java | 40 ------------------- .../client/LibVKXBoomModelProvider.java | 19 --------- .../libvkx/client/LibVKXClient.java | 25 +++++------- .../com/vk/music/model/PlayerModelImpl.smali | 18 ++++----- .../com/vtosters/lite/VKApplication.smali | 4 -- 5 files changed, 19 insertions(+), 87 deletions(-) delete mode 100644 app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXBoomModel.java delete mode 100644 app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXBoomModelProvider.java diff --git a/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXBoomModel.java b/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXBoomModel.java deleted file mode 100644 index 01412ab26..000000000 --- a/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXBoomModel.java +++ /dev/null @@ -1,40 +0,0 @@ -package bruhcollective.itaysonlab.libvkx.client; -import android.content.Context; -import android.util.Log; - -import com.vk.dto.music.MusicTrack; -import com.vk.music.common.BoomModel; -import com.vk.music.common.MusicPlaybackLaunchContext; -import com.vk.music.player.PlayerModel; - -import b.h.g.g.PackageManagerHelper; - -public class LibVKXBoomModel implements BoomModel{ - private final PlayerModel playerModel; - - public LibVKXBoomModel(PlayerModel playerModel) { - this.playerModel = playerModel; - } - - // Has/Hasn't application - @Override - public boolean b() { - return PackageManagerHelper.a(ClientConstants.PACKAGE, 128) != null; - } - - @Override - public void a(Context context, int i, int i1, String s, From from, MusicPlaybackLaunchContext musicPlaybackLaunchContext){ - Log.d("libvkx:boom", "using LibVKXBoomModel"); - } - - @Override - public void a(Context context, MusicTrack musicTrack, From from, MusicPlaybackLaunchContext musicPlaybackLaunchContext) { - Log.d("libvkx:model", " track = "+musicTrack+" / from = "+from+" / context"+musicPlaybackLaunchContext); - // AudioSetForDownloadRequest - } - - @Override - public void a(Context context, From from) { - Log.d("libvkx:model", " from = "+from); - } -} diff --git a/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXBoomModelProvider.java b/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXBoomModelProvider.java deleted file mode 100644 index 63247c97e..000000000 --- a/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXBoomModelProvider.java +++ /dev/null @@ -1,19 +0,0 @@ -package bruhcollective.itaysonlab.libvkx.client; -import android.util.Log; - -import com.vk.music.common.BoomModel; -import com.vk.music.n.BoomModelImpl; -import com.vk.music.player.PlayerModel; -import com.vk.music.restriction.MusicRestrictionManager; - -public class LibVKXBoomModelProvider{ - public static BoomModel createModel(PlayerModel playerModel, MusicRestrictionManager restrictionManager) { - if (LibVKXClient.isIntegrationEnabled()) { - Log.d("libvkx:boom", "using LibVKXBoomModel"); - return new LibVKXBoomModel(playerModel); - } else { - Log.d("libvkx:boom", "using BoomModelImpl"); - return new BoomModelImpl(playerModel, restrictionManager); - } - } -} diff --git a/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java b/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java index bf670488d..d185a864e 100644 --- a/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java +++ b/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java @@ -1,12 +1,11 @@ package bruhcollective.itaysonlab.libvkx.client; import static ru.vtosters.lite.utils.Globals.getContext; -import static ru.vtosters.lite.utils.Globals.sendToast; import static ru.vtosters.lite.utils.Preferences.getBoolValue; import android.content.Context; -import android.os.Build; import android.os.RemoteException; +import android.util.Log; import com.vk.dto.music.MusicTrack; import com.vk.music.common.MusicPlaybackLaunchContext; @@ -15,7 +14,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import b.h.g.g.PackageManagerHelper; import bruhcollective.itaysonlab.libvkx.ILibVkxService; public class LibVKXClient{ @@ -51,35 +49,32 @@ public class LibVKXClient{ return false; } - if (Build.VERSION.SDK_INT >= 31) { - sendToast("Интеграция не поддерживается на версии Android >= 12"); - return false; - } + Log.d("LibVKXClient", "playing: " + musicTrack.toString()); - LibVKXClientImpl.LibVKXAction action = iLibVkxService -> LibVKXClient.lambdaplay(list, musicTrack, playerRefer, iLibVkxService); + LibVKXClientImpl.LibVKXAction action = iLibVkxService -> LibVKXClient.lambdaplay(list, musicTrack, iLibVkxService); return getInstance().runOnService(action); } - public static void lambdaplay(List list, MusicTrack musicTrack, MusicPlaybackLaunchContext playerRefer, ILibVkxService iLibVkxService){ + public static void lambdaplay(List list, MusicTrack musicTrack, ILibVkxService iLibVkxService){ int indexOf = list.indexOf(musicTrack); - ArrayList arrayList = new ArrayList(); - Iterator it = list.iterator(); - while(it.hasNext()) { - arrayList.add(asId((MusicTrack) it.next())); + var ids = new ArrayList(); + for (var track : list) { + ids.add(asId(track)); } if (indexOf == -1) { indexOf = 0; } + Log.d("LibVKXClient", "tracks: " + ids.toString()); try { - iLibVkxService.play(arrayList, indexOf, ""); + iLibVkxService.play(ids, indexOf, ""); } catch (RemoteException e) { e.printStackTrace(); } } private static String asId(MusicTrack musicTrack){ - String str = musicTrack.d + "_" + musicTrack.e; + String str = musicTrack.e + "_" + musicTrack.d; if (musicTrack.O == null || musicTrack.O.equals("")) { return str; } diff --git a/smali/smali_classes3/com/vk/music/model/PlayerModelImpl.smali b/smali/smali_classes3/com/vk/music/model/PlayerModelImpl.smali index 25cdee934..c97701904 100644 --- a/smali/smali_classes3/com/vk/music/model/PlayerModelImpl.smali +++ b/smali/smali_classes3/com/vk/music/model/PlayerModelImpl.smali @@ -116,6 +116,15 @@ } .end annotation + invoke-static {p1, p2, p4}, Lbruhcollective/itaysonlab/libvkx/client/LibVKXClient;->play(Lcom/vk/dto/music/MusicTrack;Ljava/util/List;Lcom/vk/music/common/MusicPlaybackLaunchContext;)Z + + move-result v0 + + if-eqz v0, :cond_7 + + return-void + + :cond_7 if-eqz p2, :cond_1 if-nez p1, :cond_0 @@ -975,15 +984,6 @@ } .end annotation - invoke-static {p1, p2, p4}, Lbruhcollective/itaysonlab/libvkx/client/LibVKXClient;->play(Lcom/vk/dto/music/MusicTrack;Ljava/util/List;Lcom/vk/music/common/MusicPlaybackLaunchContext;)Z - - move-result v0 - - if-eqz v0, :cond_b - - return-void - - :cond_b const/4 v0, 0x4 new-array v0, v0, [Ljava/lang/Object; diff --git a/smali/smali_classes4/com/vtosters/lite/VKApplication.smali b/smali/smali_classes4/com/vtosters/lite/VKApplication.smali index 654c31ba3..613fbce7b 100644 --- a/smali/smali_classes4/com/vtosters/lite/VKApplication.smali +++ b/smali/smali_classes4/com/vtosters/lite/VKApplication.smali @@ -827,10 +827,6 @@ invoke-direct {v2, v0, v3}, Lcom/vk/music/n/BoomModelImpl;->(Lcom/vk/music/player/PlayerModel;Lcom/vk/music/restriction/MusicRestrictionManager;)V - # invoke-static {v1, v3}, Lbruhcollective/itaysonlab/libvkx/client/LibVKXBoomModelProvider;->createModel(Lcom/vk/music/player/PlayerModel;Lcom/vk/music/restriction/MusicRestrictionManager;)Lcom/vk/music/common/BoomModel; - - # move-result-object v2 - invoke-virtual {v1, v2}, Lcom/vk/music/common/Music$a;->a(Lcom/vk/music/common/BoomModel;)V .line 12