mirror/SmartTube
1
0
Fork 0
mirror of https://github.com/yuliskov/SmartTube.git synced 2026-01-04 04:50:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

ATV/Amazon bridge fixes

Browse Source
This commit is contained in:
Yuriy Liskov
2025-12-05 23:32:04 +02:00
parent a47d7e937f
commit da23e73a73
6 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaServiceCore

Submodule MediaServiceCore updated: ca90b58739...288cb90f0b

2
SharedModules

Submodule SharedModules updated: e0af2622a5...891ef2ecc8

2
common/src/main/AndroidManifest.xml
View File

@@ -14,6 +14,8 @@
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission android:name="android.permission.ACTION_MANAGE_OVERLAY_PERMISSION" />
<!-- <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" /> -->
<!-- Android 9+: needed to run package uninstaller (ATV, Amazon bride) -->
<uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES"/>
<!-- Android 11+: fix access package info -->
<queries>

7
common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/ATVBridgePresenter.java
View File

@@ -4,7 +4,12 @@ import android.content.Context;
import com.liskovsoft.sharedutils.helpers.Helpers;
public class ATVBridgePresenter extends BridgePresenter {
private static final Integer[] ATV_YOUTUBE_PKG_HASH = {1430778939, -672009692, -798407885, -593272746};
private static final Integer[] ATV_YOUTUBE_PKG_HASH = {
//1430778939, // Armanych
-672009692,
-798407885,
-593272746
};
private static final String ATV_YOUTUBE_PKG_NAME = "com.google.android.youtube.tv";
private static final String ATV_BRIDGE_PKG_URL = "https://github.com/yuliskov/SmartTubeNext/releases/download/latest/ATV_Bridge.apk";
private static ATVBridgePresenter sInstance;

7
common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/AmazonBridgePresenter.java
View File

@@ -4,7 +4,12 @@ import android.content.Context;
import com.liskovsoft.sharedutils.helpers.Helpers;
public class AmazonBridgePresenter extends BridgePresenter {
private static final Integer[] AMAZON_YOUTUBE_PKG_HASH = {1430778939, -672009692, -798407885, -593272746};
private static final Integer[] AMAZON_YOUTUBE_PKG_HASH = {
//1430778939, // Armanych
-672009692,
-798407885,
-593272746
};
private static final String AMAZON_YOUTUBE_PKG_NAME = "com.amazon.firetv.youtube";
private static final String AMAZON_BRIDGE_PKG_URL = "https://github.com/yuliskov/SmartTubeNext/releases/download/latest/Amazon_Bridge.apk";
private static AmazonBridgePresenter sInstance;

5
common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/dialogs/BridgePresenter.java
View File

@@ -10,6 +10,7 @@ import android.net.Uri;
import com.liskovsoft.appupdatechecker2.other.downloadmanager.DownloadManagerTask;
import com.liskovsoft.appupdatechecker2.other.downloadmanager.DownloadManagerTask.DownloadListener;
import com.liskovsoft.sharedutils.helpers.Helpers;
import com.liskovsoft.sharedutils.helpers.MessageHelpers;
import com.liskovsoft.sharedutils.mylogger.Log;
import com.liskovsoft.smartyoutubetv2.common.R;
import com.liskovsoft.smartyoutubetv2.common.app.models.playback.ui.OptionItem;
@@ -95,7 +96,7 @@ abstract class BridgePresenter extends BasePresenter<Void> implements MotherActi
private boolean isOldApkInstalled() {
PackageInfo info = getPackageSignature(getPackageName());
return Helpers.isUserApp(info) && !Helpers.equalsAny(info.signatures[0].hashCode(), getPackageSignatureHash());
return info != null && !Helpers.equalsAny(info.signatures[0].hashCode(), getPackageSignatureHash());
}
private PackageInfo getPackageSignature(String pkgName) {
@@ -126,6 +127,8 @@ abstract class BridgePresenter extends BasePresenter<Void> implements MotherActi
public void onResult(int requestCode, int resultCode, Intent data) {
if (requestCode == Helpers.REMOVE_PACKAGE_CODE && !isOldApkInstalled()) {
installBridgeFromPath(getContext());
} else {
MessageHelpers.showMessage(getContext(), "The package " + getPackageName() + " cannot be uninstalled!");
}
}