ReVanced/revanced-manager
1
0
Fork 0
mirror of https://github.com/ReVanced/revanced-manager.git synced 2026-01-11 05:36:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge synonym plugin to downloader

Browse Source
This commit is contained in:
oSumAtrIX
2026-01-08 22:00:04 +01:00
parent 25d82e869c
commit 8d0ee814fc
41 changed files with 384 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -73,7 +73,7 @@ ReVanced Manager is an application that uses [ReVanced Patcher](https://github.c
Some of the features ReVanced Manager provides are: Some of the features ReVanced Manager provides are:
- ⬇️ **Download**: Automatically download apps using the ReVanced Manager downloader plugin system - ⬇️ **Download**: Automatically download apps using the ReVanced Manager downloader system
- 💉 **Patch**: Select and apply patches to any Android app - 💉 **Patch**: Select and apply patches to any Android app
- 🛠️ **Customize**: Manage patches, apps, signing, themes, updates, and many more settings - 🛠️ **Customize**: Manage patches, apps, signing, themes, updates, and many more settings

104
api/api/api.api
View File

@@ -1,19 +1,19 @@
public abstract interface class app/revanced/manager/plugin/downloader/BaseDownloadScope : app/revanced/manager/plugin/downloader/Scope { public abstract interface class app/revanced/manager/downloader/BaseDownloadScope : app/revanced/manager/downloader/Scope {
} }
public final class app/revanced/manager/plugin/downloader/ConstantsKt { public final class app/revanced/manager/downloader/ConstantsKt {
public static final field PLUGIN_HOST_PERMISSION Ljava/lang/String; public static final field DOWNLOADER_HOST_PERMISSION Ljava/lang/String;
} }
public final class app/revanced/manager/plugin/downloader/DownloadUrl : android/os/Parcelable { public final class app/revanced/manager/downloader/DownloadUrl : android/os/Parcelable {
public static final field $stable I public static final field $stable I
public static final field CREATOR Landroid/os/Parcelable$Creator; public static final field CREATOR Landroid/os/Parcelable$Creator;
public fun <init> (Ljava/lang/String;Ljava/util/Map;)V public fun <init> (Ljava/lang/String;Ljava/util/Map;)V
public synthetic fun <init> (Ljava/lang/String;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun <init> (Ljava/lang/String;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1 ()Ljava/lang/String; public final fun component1 ()Ljava/lang/String;
public final fun component2 ()Ljava/util/Map; public final fun component2 ()Ljava/util/Map;
public final fun copy (Ljava/lang/String;Ljava/util/Map;)Lapp/revanced/manager/plugin/downloader/DownloadUrl; public final fun copy (Ljava/lang/String;Ljava/util/Map;)Lapp/revanced/manager/downloader/DownloadUrl;
public static synthetic fun copy$default (Lapp/revanced/manager/plugin/downloader/DownloadUrl;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Lapp/revanced/manager/plugin/downloader/DownloadUrl; public static synthetic fun copy$default (Lapp/revanced/manager/downloader/DownloadUrl;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Lapp/revanced/manager/downloader/DownloadUrl;
public final fun describeContents ()I public final fun describeContents ()I
public fun equals (Ljava/lang/Object;)Z public fun equals (Ljava/lang/Object;)Z
public final fun getHeaders ()Ljava/util/Map; public final fun getHeaders ()Ljava/util/Map;
@@ -24,58 +24,61 @@ public final class app/revanced/manager/plugin/downloader/DownloadUrl : android/
public final fun writeToParcel (Landroid/os/Parcel;I)V public final fun writeToParcel (Landroid/os/Parcel;I)V
} }
public final class app/revanced/manager/plugin/downloader/DownloadUrl$Creator : android/os/Parcelable$Creator { public final class app/revanced/manager/downloader/DownloadUrl$Creator : android/os/Parcelable$Creator {
public fun <init> ()V public fun <init> ()V
public final fun createFromParcel (Landroid/os/Parcel;)Lapp/revanced/manager/plugin/downloader/DownloadUrl; public final fun createFromParcel (Landroid/os/Parcel;)Lapp/revanced/manager/downloader/DownloadUrl;
public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object; public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
public final fun newArray (I)[Lapp/revanced/manager/plugin/downloader/DownloadUrl; public final fun newArray (I)[Lapp/revanced/manager/downloader/DownloadUrl;
public synthetic fun newArray (I)[Ljava/lang/Object; public synthetic fun newArray (I)[Ljava/lang/Object;
} }
public final class app/revanced/manager/plugin/downloader/Downloader { public final class app/revanced/manager/downloader/Downloader {
public static final field $stable I public static final field $stable I
} }
public final class app/revanced/manager/plugin/downloader/DownloaderBuilder { public final class app/revanced/manager/downloader/DownloaderBuilder {
public static final field $stable I public static final field $stable I
} }
public final class app/revanced/manager/plugin/downloader/DownloaderKt { public abstract interface annotation class app/revanced/manager/downloader/DownloaderHostApi : java/lang/annotation/Annotation {
public static final fun Downloader (Lkotlin/jvm/functions/Function1;)Lapp/revanced/manager/plugin/downloader/DownloaderBuilder;
} }
public final class app/revanced/manager/plugin/downloader/DownloaderScope : app/revanced/manager/plugin/downloader/Scope { public final class app/revanced/manager/downloader/DownloaderKt {
public static final fun Downloader (Lkotlin/jvm/functions/Function1;)Lapp/revanced/manager/downloader/DownloaderBuilder;
}
public final class app/revanced/manager/downloader/DownloaderScope : app/revanced/manager/downloader/Scope {
public static final field $stable I public static final field $stable I
public final fun download (Lkotlin/jvm/functions/Function3;)V public final fun download (Lkotlin/jvm/functions/Function3;)V
public final fun get (Lkotlin/jvm/functions/Function4;)V public final fun get (Lkotlin/jvm/functions/Function4;)V
public fun getDownloaderPackageName ()Ljava/lang/String;
public fun getHostPackageName ()Ljava/lang/String; public fun getHostPackageName ()Ljava/lang/String;
public fun getPluginPackageName ()Ljava/lang/String;
public final fun useService (Landroid/content/Intent;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public final fun useService (Landroid/content/Intent;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
} }
public final class app/revanced/manager/plugin/downloader/ExtensionsKt { public final class app/revanced/manager/downloader/ExtensionsKt {
public static final fun download (Lapp/revanced/manager/plugin/downloader/DownloaderScope;Lkotlin/jvm/functions/Function4;)V public static final fun download (Lapp/revanced/manager/downloader/DownloaderScope;Lkotlin/jvm/functions/Function4;)V
} }
public abstract interface class app/revanced/manager/plugin/downloader/GetScope : app/revanced/manager/plugin/downloader/Scope { public abstract interface class app/revanced/manager/downloader/GetScope : app/revanced/manager/downloader/Scope {
public abstract fun requestStartActivity (Landroid/content/Intent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public abstract fun requestStartActivity (Landroid/content/Intent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
} }
public abstract interface class app/revanced/manager/plugin/downloader/InputDownloadScope : app/revanced/manager/plugin/downloader/BaseDownloadScope { public abstract interface class app/revanced/manager/downloader/InputDownloadScope : app/revanced/manager/downloader/BaseDownloadScope {
} }
public abstract interface class app/revanced/manager/plugin/downloader/OutputDownloadScope : app/revanced/manager/plugin/downloader/BaseDownloadScope { public abstract interface class app/revanced/manager/downloader/OutputDownloadScope : app/revanced/manager/downloader/BaseDownloadScope {
public abstract fun reportSize (JLkotlin/coroutines/Continuation;)Ljava/lang/Object; public abstract fun reportSize (JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
} }
public final class app/revanced/manager/plugin/downloader/Package : android/os/Parcelable { public final class app/revanced/manager/downloader/Package : android/os/Parcelable {
public static final field $stable I public static final field $stable I
public static final field CREATOR Landroid/os/Parcelable$Creator; public static final field CREATOR Landroid/os/Parcelable$Creator;
public fun <init> (Ljava/lang/String;Ljava/lang/String;)V public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
public final fun component1 ()Ljava/lang/String; public final fun component1 ()Ljava/lang/String;
public final fun component2 ()Ljava/lang/String; public final fun component2 ()Ljava/lang/String;
public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lapp/revanced/manager/plugin/downloader/Package; public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lapp/revanced/manager/downloader/Package;
public static synthetic fun copy$default (Lapp/revanced/manager/plugin/downloader/Package;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lapp/revanced/manager/plugin/downloader/Package; public static synthetic fun copy$default (Lapp/revanced/manager/downloader/Package;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lapp/revanced/manager/downloader/Package;
public final fun describeContents ()I public final fun describeContents ()I
public fun equals (Ljava/lang/Object;)Z public fun equals (Ljava/lang/Object;)Z
public final fun getName ()Ljava/lang/String; public final fun getName ()Ljava/lang/String;
@@ -85,98 +88,95 @@ public final class app/revanced/manager/plugin/downloader/Package : android/os/P
public final fun writeToParcel (Landroid/os/Parcel;I)V public final fun writeToParcel (Landroid/os/Parcel;I)V
} }
public final class app/revanced/manager/plugin/downloader/Package$Creator : android/os/Parcelable$Creator { public final class app/revanced/manager/downloader/Package$Creator : android/os/Parcelable$Creator {
public fun <init> ()V public fun <init> ()V
public final fun createFromParcel (Landroid/os/Parcel;)Lapp/revanced/manager/plugin/downloader/Package; public final fun createFromParcel (Landroid/os/Parcel;)Lapp/revanced/manager/downloader/Package;
public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object; public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
public final fun newArray (I)[Lapp/revanced/manager/plugin/downloader/Package; public final fun newArray (I)[Lapp/revanced/manager/downloader/Package;
public synthetic fun newArray (I)[Ljava/lang/Object; public synthetic fun newArray (I)[Ljava/lang/Object;
} }
public abstract interface annotation class app/revanced/manager/plugin/downloader/PluginHostApi : java/lang/annotation/Annotation { public abstract interface class app/revanced/manager/downloader/Scope {
} public abstract fun getDownloaderPackageName ()Ljava/lang/String;
public abstract interface class app/revanced/manager/plugin/downloader/Scope {
public abstract fun getHostPackageName ()Ljava/lang/String; public abstract fun getHostPackageName ()Ljava/lang/String;
public abstract fun getPluginPackageName ()Ljava/lang/String;
} }
public abstract class app/revanced/manager/plugin/downloader/UserInteractionException : java/lang/Exception { public abstract class app/revanced/manager/downloader/UserInteractionException : java/lang/Exception {
public static final field $stable I public static final field $stable I
public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
} }
public abstract class app/revanced/manager/plugin/downloader/UserInteractionException$Activity : app/revanced/manager/plugin/downloader/UserInteractionException { public abstract class app/revanced/manager/downloader/UserInteractionException$Activity : app/revanced/manager/downloader/UserInteractionException {
public static final field $stable I public static final field $stable I
public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
} }
public final class app/revanced/manager/plugin/downloader/UserInteractionException$Activity$Cancelled : app/revanced/manager/plugin/downloader/UserInteractionException$Activity { public final class app/revanced/manager/downloader/UserInteractionException$Activity$Cancelled : app/revanced/manager/downloader/UserInteractionException$Activity {
public static final field $stable I public static final field $stable I
} }
public final class app/revanced/manager/plugin/downloader/UserInteractionException$Activity$NotCompleted : app/revanced/manager/plugin/downloader/UserInteractionException$Activity { public final class app/revanced/manager/downloader/UserInteractionException$Activity$NotCompleted : app/revanced/manager/downloader/UserInteractionException$Activity {
public static final field $stable I public static final field $stable I
public final fun getIntent ()Landroid/content/Intent; public final fun getIntent ()Landroid/content/Intent;
public final fun getResultCode ()I public final fun getResultCode ()I
} }
public final class app/revanced/manager/plugin/downloader/UserInteractionException$RequestDenied : app/revanced/manager/plugin/downloader/UserInteractionException { public final class app/revanced/manager/downloader/UserInteractionException$RequestDenied : app/revanced/manager/downloader/UserInteractionException {
public static final field $stable I public static final field $stable I
} }
public final class app/revanced/manager/plugin/downloader/webview/APIKt { public final class app/revanced/manager/downloader/webview/APIKt {
public static final fun WebViewDownloader (Lkotlin/jvm/functions/Function4;)Lapp/revanced/manager/plugin/downloader/DownloaderBuilder; public static final fun WebViewDownloader (Lkotlin/jvm/functions/Function4;)Lapp/revanced/manager/downloader/DownloaderBuilder;
public static final fun runWebView (Lapp/revanced/manager/plugin/downloader/GetScope;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public static final fun runWebView (Lapp/revanced/manager/downloader/GetScope;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
} }
public class app/revanced/manager/plugin/downloader/webview/IWebView$Default : app/revanced/manager/plugin/downloader/webview/IWebView { public class app/revanced/manager/downloader/webview/IWebView$Default : app/revanced/manager/downloader/webview/IWebView {
public fun <init> ()V public fun <init> ()V
public fun asBinder ()Landroid/os/IBinder; public fun asBinder ()Landroid/os/IBinder;
public fun finish ()V public fun finish ()V
public fun load (Ljava/lang/String;)V public fun load (Ljava/lang/String;)V
} }
public abstract class app/revanced/manager/plugin/downloader/webview/IWebView$Stub : android/os/Binder, app/revanced/manager/plugin/downloader/webview/IWebView { public abstract class app/revanced/manager/downloader/webview/IWebView$Stub : android/os/Binder, app/revanced/manager/downloader/webview/IWebView {
public fun <init> ()V public fun <init> ()V
public fun asBinder ()Landroid/os/IBinder; public fun asBinder ()Landroid/os/IBinder;
public static fun asInterface (Landroid/os/IBinder;)Lapp/revanced/manager/plugin/downloader/webview/IWebView; public static fun asInterface (Landroid/os/IBinder;)Lapp/revanced/manager/downloader/webview/IWebView;
public fun onTransact (ILandroid/os/Parcel;Landroid/os/Parcel;I)Z public fun onTransact (ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
} }
public class app/revanced/manager/plugin/downloader/webview/IWebViewEvents$Default : app/revanced/manager/plugin/downloader/webview/IWebViewEvents { public class app/revanced/manager/downloader/webview/IWebViewEvents$Default : app/revanced/manager/downloader/webview/IWebViewEvents {
public fun <init> ()V public fun <init> ()V
public fun asBinder ()Landroid/os/IBinder; public fun asBinder ()Landroid/os/IBinder;
public fun download (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V public fun download (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
public fun pageLoad (Ljava/lang/String;)V public fun pageLoad (Ljava/lang/String;)V
public fun ready (Lapp/revanced/manager/plugin/downloader/webview/IWebView;)V public fun ready (Lapp/revanced/manager/downloader/webview/IWebView;)V
} }
public abstract class app/revanced/manager/plugin/downloader/webview/IWebViewEvents$Stub : android/os/Binder, app/revanced/manager/plugin/downloader/webview/IWebViewEvents { public abstract class app/revanced/manager/downloader/webview/IWebViewEvents$Stub : android/os/Binder, app/revanced/manager/downloader/webview/IWebViewEvents {
public fun <init> ()V public fun <init> ()V
public fun asBinder ()Landroid/os/IBinder; public fun asBinder ()Landroid/os/IBinder;
public static fun asInterface (Landroid/os/IBinder;)Lapp/revanced/manager/plugin/downloader/webview/IWebViewEvents; public static fun asInterface (Landroid/os/IBinder;)Lapp/revanced/manager/downloader/webview/IWebViewEvents;
public fun onTransact (ILandroid/os/Parcel;Landroid/os/Parcel;I)Z public fun onTransact (ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
} }
public final class app/revanced/manager/plugin/downloader/webview/WebViewActivity$Parameters$Creator : android/os/Parcelable$Creator { public final class app/revanced/manager/downloader/webview/WebViewActivity$Parameters$Creator : android/os/Parcelable$Creator {
public fun <init> ()V public fun <init> ()V
public final fun createFromParcel (Landroid/os/Parcel;)Lapp/revanced/manager/plugin/downloader/webview/WebViewActivity$Parameters; public final fun createFromParcel (Landroid/os/Parcel;)Lapp/revanced/manager/downloader/webview/WebViewActivity$Parameters;
public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object; public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
public final fun newArray (I)[Lapp/revanced/manager/plugin/downloader/webview/WebViewActivity$Parameters; public final fun newArray (I)[Lapp/revanced/manager/downloader/webview/WebViewActivity$Parameters;
public synthetic fun newArray (I)[Ljava/lang/Object; public synthetic fun newArray (I)[Ljava/lang/Object;
} }
public abstract interface class app/revanced/manager/plugin/downloader/webview/WebViewCallbackScope : app/revanced/manager/plugin/downloader/Scope { public abstract interface class app/revanced/manager/downloader/webview/WebViewCallbackScope : app/revanced/manager/downloader/Scope {
public abstract fun finish (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public abstract fun finish (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public abstract fun load (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public abstract fun load (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
} }
public final class app/revanced/manager/plugin/downloader/webview/WebViewScope : app/revanced/manager/plugin/downloader/Scope { public final class app/revanced/manager/downloader/webview/WebViewScope : app/revanced/manager/downloader/Scope {
public static final field $stable I public static final field $stable I
public final fun download (Lkotlin/jvm/functions/Function5;)V public final fun download (Lkotlin/jvm/functions/Function5;)V
public fun getDownloaderPackageName ()Ljava/lang/String;
public fun getHostPackageName ()Ljava/lang/String; public fun getHostPackageName ()Ljava/lang/String;
public fun getPluginPackageName ()Ljava/lang/String;
public final fun pageLoad (Lkotlin/jvm/functions/Function3;)V public final fun pageLoad (Lkotlin/jvm/functions/Function3;)V
} }

4
api/build.gradle.kts
View File

@@ -18,7 +18,7 @@ dependencies {
} }
android { android {
namespace = "app.revanced.manager.plugin.downloader" namespace = "app.revanced.manager.downloader"
compileSdk = 35 compileSdk = 35
defaultConfig { defaultConfig {
@@ -52,7 +52,7 @@ android {
} }
apiValidation { apiValidation {
nonPublicMarkers += "app.revanced.manager.plugin.downloader.PluginHostApi" nonPublicMarkers += "app.revanced.manager.downloader.DownloaderHostApi"
} }
publishing { publishing {

8
api/src/main/aidl/app/revanced/manager/downloader/webview/IWebView.aidl Normal file
View File

@@ -0,0 +1,8 @@
// IWebView.aidl
package app.revanced.manager.downloader.webview;
@JavaPassthrough(annotation="@app.revanced.manager.downloader.DownloaderHostApi")
oneway interface IWebView {
void load(String url);
void finish();
}

11
api/src/main/aidl/app/revanced/manager/downloader/webview/IWebViewEvents.aidl Normal file
View File

@@ -0,0 +1,11 @@
// IWebViewEvents.aidl
package app.revanced.manager.downloader.webview;
import app.revanced.manager.downloader.webview.IWebView;
@JavaPassthrough(annotation="@app.revanced.manager.downloader.DownloaderHostApi")
oneway interface IWebViewEvents {
void ready(IWebView iface);
void pageLoad(String url);
void download(String url, String mimetype, String userAgent);
}

8
api/src/main/aidl/app/revanced/manager/plugin/downloader/webview/IWebView.aidl
View File

@@ -1,8 +0,0 @@
// IWebView.aidl
package app.revanced.manager.plugin.downloader.webview;
@JavaPassthrough(annotation="@app.revanced.manager.plugin.downloader.PluginHostApi")
oneway interface IWebView {
void load(String url);
void finish();
}

11
api/src/main/aidl/app/revanced/manager/plugin/downloader/webview/IWebViewEvents.aidl
View File

@@ -1,11 +0,0 @@
// IWebViewEvents.aidl
package app.revanced.manager.plugin.downloader.webview;
import app.revanced.manager.plugin.downloader.webview.IWebView;
@JavaPassthrough(annotation="@app.revanced.manager.plugin.downloader.PluginHostApi")
oneway interface IWebViewEvents {
void ready(IWebView iface);
void pageLoad(String url);
void download(String url, String mimetype, String userAgent);
}

7
api/src/main/kotlin/app/revanced/manager/downloader/Constants.kt Normal file
View File

@@ -0,0 +1,7 @@
package app.revanced.manager.downloader
/**
* The permission ID of the special downloader host permission. Only ReVanced Manager will have this permission.
* Downloader UI activities and internal services can be protected using this permission.
*/
const val DOWNLOADER_HOST_PERMISSION = "app.revanced.manager.permission.DOWNLOADER_HOST"

34
api/src/main/kotlin/app/revanced/manager/plugin/downloader/Downloader.kt → api/src/main/kotlin/app/revanced/manager/downloader/Downloader.kt
View File

@@ -1,4 +1,4 @@
package app.revanced.manager.plugin.downloader package app.revanced.manager.downloader
import android.content.ComponentName import android.content.ComponentName
import android.content.Context import android.content.Context
@@ -15,10 +15,10 @@ import kotlin.coroutines.suspendCoroutine
@RequiresOptIn( @RequiresOptIn(
level = RequiresOptIn.Level.ERROR, level = RequiresOptIn.Level.ERROR,
message = "This API is only intended for plugin hosts, don't use it in a plugin.", message = "This API is only intended for downloader hosts, don't use it in a downloader.",
) )
@Retention(AnnotationRetention.BINARY) @Retention(AnnotationRetention.BINARY)
annotation class PluginHostApi annotation class DownloaderHostApi
/** /**
* The base interface for all DSL scopes. * The base interface for all DSL scopes.
@@ -30,9 +30,9 @@ interface Scope {
val hostPackageName: String val hostPackageName: String
/** /**
* The package name of the plugin. * The package name of the downloader.
*/ */
val pluginPackageName: String val downloaderPackageName: String
} }
/** /**
@@ -43,7 +43,7 @@ interface GetScope : Scope {
* Ask the user to perform some required interaction in the activity specified by the provided [Intent]. * Ask the user to perform some required interaction in the activity specified by the provided [Intent].
* This function returns normally with the resulting [Intent] when the activity finishes with code [Activity.RESULT_OK]. * This function returns normally with the resulting [Intent] when the activity finishes with code [Activity.RESULT_OK].
* *
* @throws UserInteractionException.RequestDenied User decided to skip this plugin. * @throws UserInteractionException.RequestDenied User decided to skip this downloader.
* @throws UserInteractionException.Activity.Cancelled The activity was cancelled. * @throws UserInteractionException.Activity.Cancelled The activity was cancelled.
* @throws UserInteractionException.Activity.NotCompleted The activity finished with an unknown result code. * @throws UserInteractionException.Activity.NotCompleted The activity finished with an unknown result code.
*/ */
@@ -67,14 +67,14 @@ class DownloaderScope<T : Parcelable> internal constructor(
private val scopeImpl: Scope, private val scopeImpl: Scope,
internal val context: Context internal val context: Context
) : Scope by scopeImpl { ) : Scope by scopeImpl {
// Returning an InputStream is the primary way for plugins to implement the download function, but we also want to offer an OutputStream API since using InputStream might not be convenient in all cases. // Returning an InputStream is the primary way for downloader to implement the download function, but we also want to offer an OutputStream API since using InputStream might not be convenient in all cases.
// It is much easier to implement the main InputStream API on top of OutputStreams compared to doing it the other way around, which is why we are using OutputStream here. This detail is not visible to plugins. // It is much easier to implement the main InputStream API on top of OutputStreams compared to doing it the other way around, which is why we are using OutputStream here. This detail is not visible to downloader.
internal var download: (suspend OutputDownloadScope.(T, OutputStream) -> Unit)? = null internal var download: (suspend OutputDownloadScope.(T, OutputStream) -> Unit)? = null
internal var get: (suspend GetScope.(String, String?) -> GetResult<T>?)? = null internal var get: (suspend GetScope.(String, String?) -> GetResult<T>?)? = null
private val inputDownloadScopeImpl = object : InputDownloadScope, Scope by scopeImpl {} private val inputDownloadScopeImpl = object : InputDownloadScope, Scope by scopeImpl {}
/** /**
* Define the download block of the plugin. * Define the download block of the downloader.
*/ */
fun download(block: suspend InputDownloadScope.(data: T) -> DownloadResult) { fun download(block: suspend InputDownloadScope.(data: T) -> DownloadResult) {
download = { app, outputStream -> download = { app, outputStream ->
@@ -88,7 +88,7 @@ class DownloaderScope<T : Parcelable> internal constructor(
} }
/** /**
* Define the get block of the plugin. * Define the get block of the downloader.
* The block should return null if the app cannot be found. The version in the result must match the version argument unless it is null. * The block should return null if the app cannot be found. The version in the result must match the version argument unless it is null.
*/ */
fun get(block: suspend GetScope.(packageName: String, version: String?) -> GetResult<T>?) { fun get(block: suspend GetScope.(packageName: String, version: String?) -> GetResult<T>?) {
@@ -123,7 +123,7 @@ class DownloaderScope<T : Parcelable> internal constructor(
} }
class DownloaderBuilder<T : Parcelable> internal constructor(private val block: DownloaderScope<T>.() -> Unit) { class DownloaderBuilder<T : Parcelable> internal constructor(private val block: DownloaderScope<T>.() -> Unit) {
@PluginHostApi @DownloaderHostApi
fun build(scopeImpl: Scope, context: Context) = fun build(scopeImpl: Scope, context: Context) =
with(DownloaderScope<T>(scopeImpl, context)) { with(DownloaderScope<T>(scopeImpl, context)) {
block() block()
@@ -136,12 +136,12 @@ class DownloaderBuilder<T : Parcelable> internal constructor(private val block:
} }
class Downloader<T : Parcelable> internal constructor( class Downloader<T : Parcelable> internal constructor(
@property:PluginHostApi val get: suspend GetScope.(packageName: String, version: String?) -> GetResult<T>?, @property:DownloaderHostApi val get: suspend GetScope.(packageName: String, version: String?) -> GetResult<T>?,
@property:PluginHostApi val download: suspend OutputDownloadScope.(data: T, outputStream: OutputStream) -> Unit @property:DownloaderHostApi val download: suspend OutputDownloadScope.(data: T, outputStream: OutputStream) -> Unit
) )
/** /**
* Define a downloader plugin. * Define a downloader.
*/ */
fun <T : Parcelable> Downloader(block: DownloaderScope<T>.() -> Unit) = DownloaderBuilder(block) fun <T : Parcelable> Downloader(block: DownloaderScope<T>.() -> Unit) = DownloaderBuilder(block)
@@ -149,17 +149,17 @@ fun <T : Parcelable> Downloader(block: DownloaderScope<T>.() -> Unit) = Download
* @see GetScope.requestStartActivity * @see GetScope.requestStartActivity
*/ */
sealed class UserInteractionException(message: String) : Exception(message) { sealed class UserInteractionException(message: String) : Exception(message) {
class RequestDenied @PluginHostApi constructor() : class RequestDenied @DownloaderHostApi constructor() :
UserInteractionException("Request denied by user") UserInteractionException("Request denied by user")
sealed class Activity(message: String) : UserInteractionException(message) { sealed class Activity(message: String) : UserInteractionException(message) {
class Cancelled @PluginHostApi constructor() : Activity("Interaction cancelled") class Cancelled @DownloaderHostApi constructor() : Activity("Interaction cancelled")
/** /**
* @param resultCode The result code of the activity. * @param resultCode The result code of the activity.
* @param intent The [Intent] of the activity. * @param intent The [Intent] of the activity.
*/ */
class NotCompleted @PluginHostApi constructor(val resultCode: Int, val intent: Intent?) : class NotCompleted @DownloaderHostApi constructor(val resultCode: Int, val intent: Intent?) :
Activity("Unexpected activity result code: $resultCode") Activity("Unexpected activity result code: $resultCode")
} }
} }

6
api/src/main/kotlin/app/revanced/manager/plugin/downloader/Extensions.kt → api/src/main/kotlin/app/revanced/manager/downloader/Extensions.kt
View File

@@ -1,4 +1,4 @@
package app.revanced.manager.plugin.downloader package app.revanced.manager.downloader
import android.app.Activity import android.app.Activity
import android.app.Service import android.app.Service
@@ -28,7 +28,7 @@ fun <T : Parcelable> DownloaderScope<T>.download(block: suspend OutputDownloadSc
*/ */
suspend inline fun <reified ACTIVITY : Activity> GetScope.requestStartActivity() = suspend inline fun <reified ACTIVITY : Activity> GetScope.requestStartActivity() =
requestStartActivity( requestStartActivity(
Intent().apply { setClassName(pluginPackageName, ACTIVITY::class.qualifiedName!!) } Intent().apply { setClassName(downloaderPackageName, ACTIVITY::class.qualifiedName!!) }
) )
/** /**
@@ -38,5 +38,5 @@ suspend inline fun <reified ACTIVITY : Activity> GetScope.requestStartActivity()
suspend inline fun <reified SERVICE : Service, R : Any?> DownloaderScope<*>.useService( suspend inline fun <reified SERVICE : Service, R : Any?> DownloaderScope<*>.useService(
noinline block: suspend (IBinder) -> R noinline block: suspend (IBinder) -> R
) = useService( ) = useService(
Intent().apply { setClassName(pluginPackageName, SERVICE::class.qualifiedName!!) }, block Intent().apply { setClassName(downloaderPackageName, SERVICE::class.qualifiedName!!) }, block
) )

4
api/src/main/kotlin/app/revanced/manager/plugin/downloader/Parcelables.kt → api/src/main/kotlin/app/revanced/manager/downloader/Parcelables.kt
View File

@@ -1,4 +1,4 @@
package app.revanced.manager.plugin.downloader package app.revanced.manager.downloader
import android.os.Parcelable import android.os.Parcelable
import kotlinx.parcelize.Parcelize import kotlinx.parcelize.Parcelize
@@ -7,7 +7,7 @@ import java.net.URI
/** /**
* A simple parcelable data class for storing a package name and version. * A simple parcelable data class for storing a package name and version.
* This can be used as the data type for plugins that only need a name and version to implement their [DownloaderScope.download] function. * This can be used as the data type for downloader that only need a name and version to implement their [DownloaderScope.download] function.
* *
* @param name The package name. * @param name The package name.
* @param version The version. * @param version The version.

20
api/src/main/kotlin/app/revanced/manager/plugin/downloader/webview/API.kt → api/src/main/kotlin/app/revanced/manager/downloader/webview/API.kt
View File

@@ -1,12 +1,14 @@
package app.revanced.manager.plugin.downloader.webview package app.revanced.manager.downloader.webview
import android.content.Intent import android.content.Intent
import app.revanced.manager.plugin.downloader.DownloadUrl import app.revanced.manager.downloader.DownloadUrl
import app.revanced.manager.plugin.downloader.DownloaderScope import app.revanced.manager.downloader.DownloaderScope
import app.revanced.manager.plugin.downloader.GetScope import app.revanced.manager.downloader.GetScope
import app.revanced.manager.plugin.downloader.Scope import app.revanced.manager.downloader.Scope
import app.revanced.manager.plugin.downloader.Downloader import app.revanced.manager.downloader.Downloader
import app.revanced.manager.plugin.downloader.PluginHostApi import app.revanced.manager.downloader.DownloaderHostApi
import app.revanced.manager.downloader.webview.IWebView
import app.revanced.manager.downloader.webview.IWebViewEvents
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -32,7 +34,7 @@ interface WebViewCallbackScope<T> : Scope {
suspend fun load(url: String) suspend fun load(url: String)
} }
@OptIn(PluginHostApi::class) @OptIn(DownloaderHostApi::class)
class WebViewScope<T> internal constructor( class WebViewScope<T> internal constructor(
coroutineScope: CoroutineScope, coroutineScope: CoroutineScope,
private val scopeImpl: Scope, private val scopeImpl: Scope,
@@ -110,7 +112,7 @@ private value class Container<U>(val value: U)
* @param title The string displayed in the action bar. * @param title The string displayed in the action bar.
* @param block The control block. * @param block The control block.
*/ */
@OptIn(PluginHostApi::class) @OptIn(DownloaderHostApi::class)
suspend fun <T> GetScope.runWebView( suspend fun <T> GetScope.runWebView(
title: String, title: String,
block: suspend WebViewScope<T>.() -> InitialUrl block: suspend WebViewScope<T>.() -> InitialUrl

12
api/src/main/kotlin/app/revanced/manager/plugin/downloader/webview/WebViewActivity.kt → api/src/main/kotlin/app/revanced/manager/downloader/webview/WebViewActivity.kt
View File

@@ -1,4 +1,4 @@
package app.revanced.manager.plugin.downloader.webview package app.revanced.manager.downloader.webview
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.os.Bundle import android.os.Bundle
@@ -20,15 +20,15 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle import androidx.lifecycle.repeatOnLifecycle
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import app.revanced.manager.plugin.downloader.PluginHostApi import app.revanced.manager.downloader.DownloaderHostApi
import app.revanced.manager.plugin.downloader.R import app.revanced.manager.downloader.R
import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.flow.receiveAsFlow
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.parcelize.Parcelize import kotlinx.parcelize.Parcelize
@OptIn(PluginHostApi::class) @OptIn(DownloaderHostApi::class)
@PluginHostApi @DownloaderHostApi
class WebViewActivity : ComponentActivity() { class WebViewActivity : ComponentActivity() {
@SuppressLint("SetJavaScriptEnabled") @SuppressLint("SetJavaScriptEnabled")
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
@@ -110,7 +110,7 @@ class WebViewActivity : ComponentActivity() {
} }
} }
@OptIn(PluginHostApi::class) @OptIn(DownloaderHostApi::class)
internal class WebViewModel : ViewModel() { internal class WebViewModel : ViewModel() {
init { init {
CookieManager.getInstance().apply { CookieManager.getInstance().apply {

7
api/src/main/kotlin/app/revanced/manager/plugin/downloader/Constants.kt
View File

@@ -1,7 +0,0 @@
package app.revanced.manager.plugin.downloader
/**
* The permission ID of the special plugin host permission. Only ReVanced Manager will have this permission.
* Plugin UI activities and internal services can be protected using this permission.
*/
const val PLUGIN_HOST_PERMISSION = "app.revanced.manager.permission.PLUGIN_HOST"

2
app/proguard-rules.pro vendored
View File

@@ -1,7 +1,7 @@
-dontobfuscate -dontobfuscate
-keep class app.revanced.manager.patcher.runtime.process.* { *; } -keep class app.revanced.manager.patcher.runtime.process.* { *; }
-keep class app.revanced.manager.plugin.** { *; } -keep class app.revanced.manager.downloader.** { *; }
-keep class app.revanced.patcher.** { *; } -keep class app.revanced.patcher.** { *; }
-keep class com.android.tools.smali.** { *; } -keep class com.android.tools.smali.** { *; }
-keep class kotlin.** { *; } -keep class kotlin.** { *; }

30
app/schemas/app.revanced.manager.data.room.AppDatabase/1.json
View File

@@ -2,7 +2,7 @@
"formatVersion": 1, "formatVersion": 1,
"database": { "database": {
"version": 1, "version": 1,
"identityHash": "d0119047505da435972c5247181de675", "identityHash": "9a937123afc782978d185d00c35d20e0",
"entities": [ "entities": [
{ {
"tableName": "patch_bundles", "tableName": "patch_bundles",
@@ -21,10 +21,9 @@
"notNull": true "notNull": true
}, },
{ {
"fieldPath": "version", "fieldPath": "versionHash",
"columnName": "version", "columnName": "version",
"affinity": "TEXT", "affinity": "TEXT"
"notNull": false
}, },
{ {
"fieldPath": "source", "fieldPath": "source",
@@ -44,9 +43,7 @@
"columnNames": [ "columnNames": [
"uid" "uid"
] ]
}, }
"indices": [],
"foreignKeys": []
}, },
{ {
"tableName": "patch_selections", "tableName": "patch_selections",
@@ -127,7 +124,6 @@
"patch_name" "patch_name"
] ]
}, },
"indices": [],
"foreignKeys": [ "foreignKeys": [
{ {
"table": "patch_selections", "table": "patch_selections",
@@ -177,9 +173,7 @@
"package_name", "package_name",
"version" "version"
] ]
}, }
"indices": [],
"foreignKeys": []
}, },
{ {
"tableName": "installed_app", "tableName": "installed_app",
@@ -215,9 +209,7 @@
"columnNames": [ "columnNames": [
"current_package_name" "current_package_name"
] ]
}, }
"indices": [],
"foreignKeys": []
}, },
{ {
"tableName": "applied_patch", "tableName": "applied_patch",
@@ -378,7 +370,6 @@
"key" "key"
] ]
}, },
"indices": [],
"foreignKeys": [ "foreignKeys": [
{ {
"table": "option_groups", "table": "option_groups",
@@ -394,7 +385,7 @@
] ]
}, },
{ {
"tableName": "trusted_downloader_plugins", "tableName": "trusted_downloader",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`package_name` TEXT NOT NULL, `signature` BLOB NOT NULL, PRIMARY KEY(`package_name`))", "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`package_name` TEXT NOT NULL, `signature` BLOB NOT NULL, PRIMARY KEY(`package_name`))",
"fields": [ "fields": [
{ {
@@ -415,15 +406,12 @@
"columnNames": [ "columnNames": [
"package_name" "package_name"
] ]
}, }
"indices": [],
"foreignKeys": []
} }
], ],
"views": [],
"setupQueries": [ "setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd0119047505da435972c5247181de675')" "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '9a937123afc782978d185d00c35d20e0')"
] ]
} }
} }

10
app/src/main/AndroidManifest.xml
View File

@@ -3,13 +3,13 @@
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<permission <permission
android:name="app.revanced.manager.permission.PLUGIN_HOST" android:name="app.revanced.manager.permission.DOWNLOADER_HOST"
android:protectionLevel="signature" android:protectionLevel="signature"
android:label="@string/plugin_host_permission_label" android:label="@string/downloader_host_permission_label"
android:description="@string/plugin_host_permission_description" android:description="@string/downloader_host_permission_description"
/> />
<uses-permission android:name="app.revanced.manager.permission.PLUGIN_HOST" /> <uses-permission android:name="app.revanced.manager.permission.DOWNLOADER_HOST" />
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
tools:ignore="QueryAllPackagesPermission" /> tools:ignore="QueryAllPackagesPermission" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -49,7 +49,7 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".plugin.downloader.webview.WebViewActivity" android:exported="false" android:theme="@style/Theme.WebViewActivity" /> <activity android:name=".downloader.webview.WebViewActivity" android:exported="false" android:theme="@style/Theme.WebViewActivity" />
<service <service
android:name="androidx.work.impl.foreground.SystemForegroundService" android:name="androidx.work.impl.foreground.SystemForegroundService"

2
app/src/main/java/app/revanced/manager/MainActivity.kt
View File

@@ -129,7 +129,7 @@ private fun ReVancedManager(vm: MainViewModel) {
onUpdateClick = { onUpdateClick = {
navController.navigate(Update()) navController.navigate(Update())
}, },
onDownloaderPluginClick = { onDownloaderClick = {
navController.navigate(Settings.Downloads) navController.navigate(Settings.Downloads)
}, },
onAppClick = { packageName -> onAppClick = { packageName ->

6
app/src/main/java/app/revanced/manager/ManagerApplication.kt
View File

@@ -7,7 +7,7 @@ import android.util.Log
import app.revanced.manager.data.platform.Filesystem import app.revanced.manager.data.platform.Filesystem
import app.revanced.manager.di.* import app.revanced.manager.di.*
import app.revanced.manager.domain.manager.PreferencesManager import app.revanced.manager.domain.manager.PreferencesManager
import app.revanced.manager.domain.repository.DownloaderPluginRepository import app.revanced.manager.domain.repository.DownloaderRepository
import app.revanced.manager.domain.repository.PatchBundleRepository import app.revanced.manager.domain.repository.PatchBundleRepository
import app.revanced.manager.util.tag import app.revanced.manager.util.tag
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
@@ -29,7 +29,7 @@ class ManagerApplication : Application() {
private val scope = MainScope() private val scope = MainScope()
private val prefs: PreferencesManager by inject() private val prefs: PreferencesManager by inject()
private val patchBundleRepository: PatchBundleRepository by inject() private val patchBundleRepository: PatchBundleRepository by inject()
private val downloaderPluginRepository: DownloaderPluginRepository by inject() private val downloaderRepository: DownloaderRepository by inject()
private val fs: Filesystem by inject() private val fs: Filesystem by inject()
override fun onCreate() { override fun onCreate() {
@@ -70,7 +70,7 @@ class ManagerApplication : Application() {
prefs.preload() prefs.preload()
} }
scope.launch(Dispatchers.Default) { scope.launch(Dispatchers.Default) {
downloaderPluginRepository.reload() downloaderRepository.reload()
} }
scope.launch(Dispatchers.Default) { scope.launch(Dispatchers.Default) {
with(patchBundleRepository) { with(patchBundleRepository) {

8
app/src/main/java/app/revanced/manager/data/room/AppDatabase.kt
View File

@@ -16,12 +16,12 @@ import app.revanced.manager.data.room.bundles.PatchBundleEntity
import app.revanced.manager.data.room.options.Option import app.revanced.manager.data.room.options.Option
import app.revanced.manager.data.room.options.OptionDao import app.revanced.manager.data.room.options.OptionDao
import app.revanced.manager.data.room.options.OptionGroup import app.revanced.manager.data.room.options.OptionGroup
import app.revanced.manager.data.room.plugins.TrustedDownloaderPlugin import app.revanced.manager.data.room.downloader.TrustedDownloader
import app.revanced.manager.data.room.plugins.TrustedDownloaderPluginDao import app.revanced.manager.data.room.downloader.TrustedDownloaderDao
import kotlin.random.Random import kotlin.random.Random
@Database( @Database(
entities = [PatchBundleEntity::class, PatchSelection::class, SelectedPatch::class, DownloadedApp::class, InstalledApp::class, AppliedPatch::class, OptionGroup::class, Option::class, TrustedDownloaderPlugin::class], entities = [PatchBundleEntity::class, PatchSelection::class, SelectedPatch::class, DownloadedApp::class, InstalledApp::class, AppliedPatch::class, OptionGroup::class, Option::class, TrustedDownloader::class],
version = 1 version = 1
) )
@TypeConverters(Converters::class) @TypeConverters(Converters::class)
@@ -31,7 +31,7 @@ abstract class AppDatabase : RoomDatabase() {
abstract fun downloadedAppDao(): DownloadedAppDao abstract fun downloadedAppDao(): DownloadedAppDao
abstract fun installedAppDao(): InstalledAppDao abstract fun installedAppDao(): InstalledAppDao
abstract fun optionDao(): OptionDao abstract fun optionDao(): OptionDao
abstract fun trustedDownloaderPluginDao(): TrustedDownloaderPluginDao abstract fun trustedDownloaderDao(): TrustedDownloaderDao
companion object { companion object {
fun generateUid() = Random.Default.nextInt() fun generateUid() = Random.Default.nextInt()

6
app/src/main/java/app/revanced/manager/data/room/plugins/TrustedDownloaderPlugin.kt → app/src/main/java/app/revanced/manager/data/room/downloader/TrustedDownloader.kt
View File

@@ -1,11 +1,11 @@
package app.revanced.manager.data.room.plugins package app.revanced.manager.data.room.downloader
import androidx.room.ColumnInfo import androidx.room.ColumnInfo
import androidx.room.Entity import androidx.room.Entity
import androidx.room.PrimaryKey import androidx.room.PrimaryKey
@Entity(tableName = "trusted_downloader_plugins") @Entity(tableName = "trusted_downloader")
class TrustedDownloaderPlugin( class TrustedDownloader(
@PrimaryKey @ColumnInfo(name = "package_name") val packageName: String, @PrimaryKey @ColumnInfo(name = "package_name") val packageName: String,
@ColumnInfo(name = "signature") val signature: ByteArray @ColumnInfo(name = "signature") val signature: ByteArray
) )

22
app/src/main/java/app/revanced/manager/data/room/downloader/TrustedDownloaderDao.kt Normal file
View File

@@ -0,0 +1,22 @@
package app.revanced.manager.data.room.downloader
import androidx.room.Dao
import androidx.room.Query
import androidx.room.Transaction
import androidx.room.Upsert
@Dao
interface TrustedDownloaderDao {
@Query("SELECT signature FROM trusted_downloader WHERE package_name = :packageName")
suspend fun getTrustedSignature(packageName: String): ByteArray?
@Upsert
suspend fun upsertTrust(downloader: TrustedDownloader)
@Query("DELETE FROM trusted_downloader WHERE package_name = :packageName")
suspend fun remove(packageName: String)
@Transaction
@Query("DELETE FROM trusted_downloader WHERE package_name IN (:packageNames)")
suspend fun removeAll(packageNames: Set<String>)
}

22
app/src/main/java/app/revanced/manager/data/room/plugins/TrustedDownloaderPluginDao.kt
View File

@@ -1,22 +0,0 @@
package app.revanced.manager.data.room.plugins
import androidx.room.Dao
import androidx.room.Query
import androidx.room.Transaction
import androidx.room.Upsert
@Dao
interface TrustedDownloaderPluginDao {
@Query("SELECT signature FROM trusted_downloader_plugins WHERE package_name = :packageName")
suspend fun getTrustedSignature(packageName: String): ByteArray?
@Upsert
suspend fun upsertTrust(plugin: TrustedDownloaderPlugin)
@Query("DELETE FROM trusted_downloader_plugins WHERE package_name = :packageName")
suspend fun remove(packageName: String)
@Transaction
@Query("DELETE FROM trusted_downloader_plugins WHERE package_name IN (:packageNames)")
suspend fun removeAll(packageNames: Set<String>)
}

2
app/src/main/java/app/revanced/manager/di/RepositoryModule.kt
View File

@@ -21,7 +21,7 @@ val repositoryModule = module {
// It is best to load patch bundles ASAP // It is best to load patch bundles ASAP
createdAtStart() createdAtStart()
} }
singleOf(::DownloaderPluginRepository) singleOf(::DownloaderRepository)
singleOf(::WorkerRepository) singleOf(::WorkerRepository)
singleOf(::DownloadedAppRepository) singleOf(::DownloadedAppRepository)
singleOf(::InstalledAppRepository) singleOf(::InstalledAppRepository)

2
app/src/main/java/app/revanced/manager/domain/manager/PreferencesManager.kt
View File

@@ -31,7 +31,7 @@ class PreferencesManager(
val disableUniversalPatchCheck = booleanPreference("disable_patch_universal_check", false) val disableUniversalPatchCheck = booleanPreference("disable_patch_universal_check", false)
val suggestedVersionSafeguard = booleanPreference("suggested_version_safeguard", true) val suggestedVersionSafeguard = booleanPreference("suggested_version_safeguard", true)
val acknowledgedDownloaderPlugins = stringSetPreference("acknowledged_downloader_plugins", emptySet()) val acknowledgedDownloader = stringSetPreference("acknowledged_downloader", emptySet())
val showDeveloperSettings = booleanPreference("show_developer_settings", context.isDebuggable) val showDeveloperSettings = booleanPreference("show_developer_settings", context.isDebuggable)

10
app/src/main/java/app/revanced/manager/domain/repository/DownloadedAppRepository.kt
View File

@@ -6,8 +6,8 @@ import android.os.Parcelable
import app.revanced.manager.data.room.AppDatabase import app.revanced.manager.data.room.AppDatabase
import app.revanced.manager.data.room.AppDatabase.Companion.generateUid import app.revanced.manager.data.room.AppDatabase.Companion.generateUid
import app.revanced.manager.data.room.apps.downloaded.DownloadedApp import app.revanced.manager.data.room.apps.downloaded.DownloadedApp
import app.revanced.manager.network.downloader.LoadedDownloaderPlugin import app.revanced.manager.network.downloader.LoadedDownloader
import app.revanced.manager.plugin.downloader.OutputDownloadScope import app.revanced.manager.downloader.OutputDownloadScope
import app.revanced.manager.util.PM import app.revanced.manager.util.PM
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.channelFlow import kotlinx.coroutines.flow.channelFlow
@@ -36,7 +36,7 @@ class DownloadedAppRepository(
private fun getApkFileForDir(directory: File) = directory.listFiles()!!.first() private fun getApkFileForDir(directory: File) = directory.listFiles()!!.first()
suspend fun download( suspend fun download(
plugin: LoadedDownloaderPlugin, downloader: LoadedDownloader,
data: Parcelable, data: Parcelable,
expectedPackageName: String, expectedPackageName: String,
expectedVersion: String?, expectedVersion: String?,
@@ -55,7 +55,7 @@ class DownloadedAppRepository(
channelFlow { channelFlow {
val scope = object : OutputDownloadScope { val scope = object : OutputDownloadScope {
override val pluginPackageName = plugin.packageName override val downloaderPackageName = downloader.packageName
override val hostPackageName = app.packageName override val hostPackageName = app.packageName
override suspend fun reportSize(size: Long) { override suspend fun reportSize(size: Long) {
require(size > 0) { "Size must be greater than zero" } require(size > 0) { "Size must be greater than zero" }
@@ -87,7 +87,7 @@ class DownloadedAppRepository(
) )
} }
} }
plugin.download(scope, data, stream) downloader.download(scope, data, stream)
} }
} }
.conflate() .conflate()

106
app/src/main/java/app/revanced/manager/domain/repository/DownloaderPluginRepository.kt → app/src/main/java/app/revanced/manager/domain/repository/DownloaderRepository.kt
View File

@@ -5,14 +5,14 @@ import android.content.pm.PackageManager
import android.os.Parcelable import android.os.Parcelable
import android.util.Log import android.util.Log
import app.revanced.manager.data.room.AppDatabase import app.revanced.manager.data.room.AppDatabase
import app.revanced.manager.data.room.plugins.TrustedDownloaderPlugin import app.revanced.manager.data.room.downloader.TrustedDownloader
import app.revanced.manager.domain.manager.PreferencesManager import app.revanced.manager.domain.manager.PreferencesManager
import app.revanced.manager.network.downloader.DownloaderPluginState import app.revanced.manager.network.downloader.DownloaderState
import app.revanced.manager.network.downloader.LoadedDownloaderPlugin import app.revanced.manager.network.downloader.LoadedDownloader
import app.revanced.manager.network.downloader.ParceledDownloaderData import app.revanced.manager.network.downloader.ParceledDownloaderData
import app.revanced.manager.plugin.downloader.DownloaderBuilder import app.revanced.manager.downloader.DownloaderBuilder
import app.revanced.manager.plugin.downloader.PluginHostApi import app.revanced.manager.downloader.DownloaderHostApi
import app.revanced.manager.plugin.downloader.Scope import app.revanced.manager.downloader.Scope
import app.revanced.manager.util.PM import app.revanced.manager.util.PM
import app.revanced.manager.util.tag import app.revanced.manager.util.tag
import dalvik.system.PathClassLoader import dalvik.system.PathClassLoader
@@ -25,74 +25,74 @@ import kotlinx.coroutines.flow.map
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import java.lang.reflect.Modifier import java.lang.reflect.Modifier
@OptIn(PluginHostApi::class) @OptIn(DownloaderHostApi::class)
class DownloaderPluginRepository( class DownloaderRepository(
private val pm: PM, private val pm: PM,
private val prefs: PreferencesManager, private val prefs: PreferencesManager,
private val app: Application, private val app: Application,
db: AppDatabase db: AppDatabase
) { ) {
private val trustDao = db.trustedDownloaderPluginDao() private val trustDao = db.trustedDownloaderDao()
private val _pluginStates = MutableStateFlow(emptyMap<String, DownloaderPluginState>()) private val _downloaderStates = MutableStateFlow(emptyMap<String, DownloaderState>())
val pluginStates = _pluginStates.asStateFlow() val downloaderStates = _downloaderStates.asStateFlow()
val loadedPluginsFlow = pluginStates.map { states -> val loadedDownloaderFlow = downloaderStates.map { states ->
states.values.filterIsInstance<DownloaderPluginState.Loaded>().map { it.plugin } states.values.filterIsInstance<DownloaderState.Loaded>().map { it.downloader }
} }
private val acknowledgedDownloaderPlugins = prefs.acknowledgedDownloaderPlugins private val acknowledgedDownloader = prefs.acknowledgedDownloader
private val installedPluginPackageNames = MutableStateFlow(emptySet<String>()) private val installedDownloaderPackageNames = MutableStateFlow(emptySet<String>())
val newPluginPackageNames = combine( val newDownloaderPackageNames = combine(
installedPluginPackageNames, installedDownloaderPackageNames,
acknowledgedDownloaderPlugins.flow acknowledgedDownloader.flow
) { installed, acknowledged -> ) { installed, acknowledged ->
installed subtract acknowledged installed subtract acknowledged
} }
suspend fun reload() { suspend fun reload() {
val plugins = val downloader =
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
pm.getPackagesWithFeature(PLUGIN_FEATURE) pm.getPackagesWithFeature(DOWNLOADER_FEATURE)
.associate { it.packageName to loadPlugin(it.packageName) } .associate { it.packageName to loadDownloader(it.packageName) }
} }
_pluginStates.value = plugins _downloaderStates.value = downloader
installedPluginPackageNames.value = plugins.keys installedDownloaderPackageNames.value = downloader.keys
val acknowledgedPlugins = acknowledgedDownloaderPlugins.get() val acknowledgedDownloader = this@DownloaderRepository.acknowledgedDownloader.get()
val uninstalledPlugins = acknowledgedPlugins subtract installedPluginPackageNames.value val uninstalledDownloader = acknowledgedDownloader subtract installedDownloaderPackageNames.value
if (uninstalledPlugins.isNotEmpty()) { if (uninstalledDownloader.isNotEmpty()) {
Log.d(tag, "Uninstalled plugins: ${uninstalledPlugins.joinToString(", ")}") Log.d(tag, "Uninstalled downloader: ${uninstalledDownloader.joinToString(", ")}")
acknowledgedDownloaderPlugins.update(acknowledgedPlugins subtract uninstalledPlugins) this@DownloaderRepository.acknowledgedDownloader.update(acknowledgedDownloader subtract uninstalledDownloader)
trustDao.removeAll(uninstalledPlugins) trustDao.removeAll(uninstalledDownloader)
} }
} }
fun unwrapParceledData(data: ParceledDownloaderData): Pair<LoadedDownloaderPlugin, Parcelable> { fun unwrapParceledData(data: ParceledDownloaderData): Pair<LoadedDownloader, Parcelable> {
val plugin = val downloader =
(_pluginStates.value[data.pluginPackageName] as? DownloaderPluginState.Loaded)?.plugin (_downloaderStates.value[data.downloaderPackageName] as? DownloaderState.Loaded)?.downloader
?: throw Exception("Downloader plugin with name ${data.pluginPackageName} is not available") ?: throw Exception("Downloader with name ${data.downloaderPackageName} is not available")
return plugin to data.unwrapWith(plugin) return downloader to data.unwrapWith(downloader)
} }
private suspend fun loadPlugin(packageName: String): DownloaderPluginState { private suspend fun loadDownloader(packageName: String): DownloaderState {
try { try {
if (!verify(packageName)) return DownloaderPluginState.Untrusted if (!verify(packageName)) return DownloaderState.Untrusted
} catch (e: CancellationException) { } catch (e: CancellationException) {
throw e throw e
} catch (e: Exception) { } catch (e: Exception) {
Log.e(tag, "Got exception while verifying plugin $packageName", e) Log.e(tag, "Got exception while verifying downloader $packageName", e)
return DownloaderPluginState.Failed(e) return DownloaderState.Failed(e)
} }
return try { return try {
val packageInfo = pm.getPackageInfo(packageName, flags = PackageManager.GET_META_DATA)!! val packageInfo = pm.getPackageInfo(packageName, flags = PackageManager.GET_META_DATA)!!
val className = packageInfo.applicationInfo!!.metaData.getString(METADATA_PLUGIN_CLASS) val className = packageInfo.applicationInfo!!.metaData.getString(METADATA_DOWNLOADER_CLASS)
?: throw Exception("Missing metadata attribute $METADATA_PLUGIN_CLASS") ?: throw Exception("Missing metadata attribute $METADATA_DOWNLOADER_CLASS")
val classLoader = val classLoader =
PathClassLoader(packageInfo.applicationInfo!!.sourceDir, app.classLoader) PathClassLoader(packageInfo.applicationInfo!!.sourceDir, app.classLoader)
val pluginContext = app.createPackageContext(packageName, 0) val downloaderContext = app.createPackageContext(packageName, 0)
val downloader = classLoader val downloader = classLoader
.loadClass(className) .loadClass(className)
@@ -100,13 +100,13 @@ class DownloaderPluginRepository(
.build( .build(
scopeImpl = object : Scope { scopeImpl = object : Scope {
override val hostPackageName = app.packageName override val hostPackageName = app.packageName
override val pluginPackageName = pluginContext.packageName override val downloaderPackageName = downloaderContext.packageName
}, },
context = pluginContext context = downloaderContext
) )
DownloaderPluginState.Loaded( DownloaderState.Loaded(
LoadedDownloaderPlugin( LoadedDownloader(
packageName, packageName,
with(pm) { packageInfo.label() }, with(pm) { packageInfo.label() },
packageInfo.versionName!!, packageInfo.versionName!!,
@@ -118,14 +118,14 @@ class DownloaderPluginRepository(
} catch (e: CancellationException) { } catch (e: CancellationException) {
throw e throw e
} catch (t: Throwable) { } catch (t: Throwable) {
Log.e(tag, "Failed to load plugin $packageName", t) Log.e(tag, "Failed to load downloader $packageName", t)
DownloaderPluginState.Failed(t) DownloaderState.Failed(t)
} }
} }
suspend fun trustPackage(packageName: String) { suspend fun trustPackage(packageName: String) {
trustDao.upsertTrust( trustDao.upsertTrust(
TrustedDownloaderPlugin( TrustedDownloader(
packageName, packageName,
pm.getSignature(packageName).toByteArray() pm.getSignature(packageName).toByteArray()
) )
@@ -133,15 +133,15 @@ class DownloaderPluginRepository(
reload() reload()
prefs.edit { prefs.edit {
acknowledgedDownloaderPlugins += packageName acknowledgedDownloader += packageName
} }
} }
suspend fun revokeTrustForPackage(packageName: String) = suspend fun revokeTrustForPackage(packageName: String) =
trustDao.remove(packageName).also { reload() } trustDao.remove(packageName).also { reload() }
suspend fun acknowledgeAllNewPlugins() = suspend fun acknowledgeAllNewDownloader() =
acknowledgedDownloaderPlugins.update(installedPluginPackageNames.value) acknowledgedDownloader.update(installedDownloaderPackageNames.value)
private suspend fun verify(packageName: String): Boolean { private suspend fun verify(packageName: String): Boolean {
val expectedSignature = val expectedSignature =
@@ -151,8 +151,8 @@ class DownloaderPluginRepository(
} }
private companion object { private companion object {
const val PLUGIN_FEATURE = "app.revanced.manager.plugin.downloader" const val DOWNLOADER_FEATURE = "app.revanced.manager.downloader"
const val METADATA_PLUGIN_CLASS = "app.revanced.manager.plugin.downloader.class" const val METADATA_DOWNLOADER_CLASS = "app.revanced.manager.downloader.class"
const val PUBLIC_STATIC = Modifier.PUBLIC or Modifier.STATIC const val PUBLIC_STATIC = Modifier.PUBLIC or Modifier.STATIC
val Int.isPublicStatic get() = (this and PUBLIC_STATIC) == PUBLIC_STATIC val Int.isPublicStatic get() = (this and PUBLIC_STATIC) == PUBLIC_STATIC

9
app/src/main/java/app/revanced/manager/network/downloader/DownloaderPluginState.kt
View File

@@ -1,9 +0,0 @@
package app.revanced.manager.network.downloader
sealed interface DownloaderPluginState {
data object Untrusted : DownloaderPluginState
data class Loaded(val plugin: LoadedDownloaderPlugin) : DownloaderPluginState
data class Failed(val throwable: Throwable) : DownloaderPluginState
}

9
app/src/main/java/app/revanced/manager/network/downloader/DownloaderState.kt Normal file
View File

@@ -0,0 +1,9 @@
package app.revanced.manager.network.downloader
sealed interface DownloaderState {
data object Untrusted : DownloaderState
data class Loaded(val downloader: LoadedDownloader) : DownloaderState
data class Failed(val throwable: Throwable) : DownloaderState
}

6
app/src/main/java/app/revanced/manager/network/downloader/LoadedDownloaderPlugin.kt → app/src/main/java/app/revanced/manager/network/downloader/LoadedDownloader.kt
View File

@@ -1,11 +1,11 @@
package app.revanced.manager.network.downloader package app.revanced.manager.network.downloader
import android.os.Parcelable import android.os.Parcelable
import app.revanced.manager.plugin.downloader.OutputDownloadScope import app.revanced.manager.downloader.OutputDownloadScope
import app.revanced.manager.plugin.downloader.GetScope import app.revanced.manager.downloader.GetScope
import java.io.OutputStream import java.io.OutputStream
class LoadedDownloaderPlugin( class LoadedDownloader(
val packageName: String, val packageName: String,
val name: String, val name: String,
val version: String, val version: String,

12
app/src/main/java/app/revanced/manager/network/downloader/ParceledDownloaderData.kt
View File

@@ -10,20 +10,20 @@ import kotlinx.parcelize.Parcelize
* A container for [Parcelable] data returned from downloader. Instances of this class can be safely stored in a bundle without needing to set the [ClassLoader]. * A container for [Parcelable] data returned from downloader. Instances of this class can be safely stored in a bundle without needing to set the [ClassLoader].
*/ */
class ParceledDownloaderData private constructor( class ParceledDownloaderData private constructor(
val pluginPackageName: String, val downloaderPackageName: String,
private val bundle: Bundle private val bundle: Bundle
) : Parcelable { ) : Parcelable {
constructor(plugin: LoadedDownloaderPlugin, data: Parcelable) : this( constructor(downloader: LoadedDownloader, data: Parcelable) : this(
plugin.packageName, downloader.packageName,
createBundle(data) createBundle(data)
) )
fun unwrapWith(plugin: LoadedDownloaderPlugin): Parcelable { fun unwrapWith(downloader: LoadedDownloader): Parcelable {
bundle.classLoader = plugin.classLoader bundle.classLoader = downloader.classLoader
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
val className = bundle.getString(CLASS_NAME_KEY)!! val className = bundle.getString(CLASS_NAME_KEY)!!
val clazz = plugin.classLoader.loadClass(className) val clazz = downloader.classLoader.loadClass(className)
bundle.getParcelable(DATA_KEY, clazz)!! as Parcelable bundle.getParcelable(DATA_KEY, clazz)!! as Parcelable
} else @Suppress("Deprecation") bundle.getParcelable(DATA_KEY)!! } else @Suppress("Deprecation") bundle.getParcelable(DATA_KEY)!!

36
app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt
View File

@@ -24,11 +24,11 @@ import app.revanced.manager.domain.installer.RootInstaller
import app.revanced.manager.domain.manager.KeystoreManager import app.revanced.manager.domain.manager.KeystoreManager
import app.revanced.manager.domain.manager.PreferencesManager import app.revanced.manager.domain.manager.PreferencesManager
import app.revanced.manager.domain.repository.DownloadedAppRepository import app.revanced.manager.domain.repository.DownloadedAppRepository
import app.revanced.manager.domain.repository.DownloaderPluginRepository import app.revanced.manager.domain.repository.DownloaderRepository
import app.revanced.manager.domain.repository.InstalledAppRepository import app.revanced.manager.domain.repository.InstalledAppRepository
import app.revanced.manager.domain.worker.Worker import app.revanced.manager.domain.worker.Worker
import app.revanced.manager.domain.worker.WorkerRepository import app.revanced.manager.domain.worker.WorkerRepository
import app.revanced.manager.network.downloader.LoadedDownloaderPlugin import app.revanced.manager.network.downloader.LoadedDownloader
import app.revanced.manager.patcher.ProgressEvent import app.revanced.manager.patcher.ProgressEvent
import app.revanced.manager.patcher.StepId import app.revanced.manager.patcher.StepId
import app.revanced.manager.patcher.logger.Logger import app.revanced.manager.patcher.logger.Logger
@@ -36,9 +36,9 @@ import app.revanced.manager.patcher.runStep
import app.revanced.manager.patcher.runtime.CoroutineRuntime import app.revanced.manager.patcher.runtime.CoroutineRuntime
import app.revanced.manager.patcher.runtime.ProcessRuntime import app.revanced.manager.patcher.runtime.ProcessRuntime
import app.revanced.manager.patcher.toRemoteError import app.revanced.manager.patcher.toRemoteError
import app.revanced.manager.plugin.downloader.GetScope import app.revanced.manager.downloader.GetScope
import app.revanced.manager.plugin.downloader.PluginHostApi import app.revanced.manager.downloader.DownloaderHostApi
import app.revanced.manager.plugin.downloader.UserInteractionException import app.revanced.manager.downloader.UserInteractionException
import app.revanced.manager.ui.model.SelectedApp import app.revanced.manager.ui.model.SelectedApp
import app.revanced.manager.util.Options import app.revanced.manager.util.Options
import app.revanced.manager.util.PM import app.revanced.manager.util.PM
@@ -51,7 +51,7 @@ import org.koin.core.component.KoinComponent
import org.koin.core.component.inject import org.koin.core.component.inject
import java.io.File import java.io.File
@OptIn(PluginHostApi::class) @OptIn(DownloaderHostApi::class)
class PatcherWorker( class PatcherWorker(
context: Context, context: Context,
parameters: WorkerParameters parameters: WorkerParameters
@@ -59,7 +59,7 @@ class PatcherWorker(
private val workerRepository: WorkerRepository by inject() private val workerRepository: WorkerRepository by inject()
private val prefs: PreferencesManager by inject() private val prefs: PreferencesManager by inject()
private val keystoreManager: KeystoreManager by inject() private val keystoreManager: KeystoreManager by inject()
private val downloaderPluginRepository: DownloaderPluginRepository by inject() private val downloaderRepository: DownloaderRepository by inject()
private val downloadedAppRepository: DownloadedAppRepository by inject() private val downloadedAppRepository: DownloadedAppRepository by inject()
private val pm: PM by inject() private val pm: PM by inject()
private val fs: Filesystem by inject() private val fs: Filesystem by inject()
@@ -72,7 +72,7 @@ class PatcherWorker(
val selectedPatches: PatchSelection, val selectedPatches: PatchSelection,
val options: Options, val options: Options,
val logger: Logger, val logger: Logger,
val handleStartActivityRequest: suspend (LoadedDownloaderPlugin, Intent) -> ActivityResult, val handleStartActivityRequest: suspend (LoadedDownloader, Intent) -> ActivityResult,
val setInputFile: suspend (File) -> Unit, val setInputFile: suspend (File) -> Unit,
val onEvent: (ProgressEvent) -> Unit, val onEvent: (ProgressEvent) -> Unit,
) { ) {
@@ -150,9 +150,9 @@ class PatcherWorker(
} }
} }
suspend fun download(plugin: LoadedDownloaderPlugin, data: Parcelable) = suspend fun download(downloader: LoadedDownloader, data: Parcelable) =
downloadedAppRepository.download( downloadedAppRepository.download(
plugin, downloader,
data, data,
args.packageName, args.packageName,
args.input.version, args.input.version,
@@ -172,27 +172,27 @@ class PatcherWorker(
val inputFile = when (val selectedApp = args.input) { val inputFile = when (val selectedApp = args.input) {
is SelectedApp.Download -> { is SelectedApp.Download -> {
runStep(StepId.DownloadAPK, args.onEvent) { runStep(StepId.DownloadAPK, args.onEvent) {
val (plugin, data) = downloaderPluginRepository.unwrapParceledData( val (downloader, data) = downloaderRepository.unwrapParceledData(
selectedApp.data selectedApp.data
) )
download(plugin, data) download(downloader, data)
} }
} }
is SelectedApp.Search -> { is SelectedApp.Search -> {
runStep(StepId.DownloadAPK, args.onEvent) { runStep(StepId.DownloadAPK, args.onEvent) {
downloaderPluginRepository.loadedPluginsFlow.first() downloaderRepository.loadedDownloaderFlow.first()
.firstNotNullOfOrNull { plugin -> .firstNotNullOfOrNull { downloader ->
try { try {
val getScope = object : GetScope { val getScope = object : GetScope {
override val pluginPackageName = plugin.packageName override val downloaderPackageName = downloader.packageName
override val hostPackageName = override val hostPackageName =
applicationContext.packageName applicationContext.packageName
override suspend fun requestStartActivity(intent: Intent): Intent? { override suspend fun requestStartActivity(intent: Intent): Intent? {
val result = val result =
args.handleStartActivityRequest(plugin, intent) args.handleStartActivityRequest(downloader, intent)
return when (result.resultCode) { return when (result.resultCode) {
Activity.RESULT_OK -> result.data Activity.RESULT_OK -> result.data
Activity.RESULT_CANCELED -> throw UserInteractionException.Activity.Cancelled() Activity.RESULT_CANCELED -> throw UserInteractionException.Activity.Cancelled()
@@ -204,7 +204,7 @@ class PatcherWorker(
} }
} }
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
plugin.get( downloader.get(
getScope, getScope,
selectedApp.packageName, selectedApp.packageName,
selectedApp.version selectedApp.version
@@ -214,7 +214,7 @@ class PatcherWorker(
throw e throw e
} catch (_: UserInteractionException) { } catch (_: UserInteractionException) {
null null
}?.let { (data, _) -> download(plugin, data) } }?.let { (data, _) -> download(downloader, data) }
} ?: throw Exception("App is not available.") } ?: throw Exception("App is not available.")
} }
} }

12
app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
View File

@@ -90,13 +90,13 @@ fun DashboardScreen(
onAppSelectorClick: () -> Unit, onAppSelectorClick: () -> Unit,
onSettingsClick: () -> Unit, onSettingsClick: () -> Unit,
onUpdateClick: () -> Unit, onUpdateClick: () -> Unit,
onDownloaderPluginClick: () -> Unit, onDownloaderClick: () -> Unit,
onAppClick: (String) -> Unit onAppClick: (String) -> Unit
) { ) {
var selectedSourceCount by rememberSaveable { mutableIntStateOf(0) } var selectedSourceCount by rememberSaveable { mutableIntStateOf(0) }
val bundlesSelectable by remember { derivedStateOf { selectedSourceCount > 0 } } val bundlesSelectable by remember { derivedStateOf { selectedSourceCount > 0 } }
val availablePatches by vm.availablePatches.collectAsStateWithLifecycle(0) val availablePatches by vm.availablePatches.collectAsStateWithLifecycle(0)
val showNewDownloaderPluginsNotification by vm.newDownloaderPluginsAvailable.collectAsStateWithLifecycle( val showNewDownloaderNotification by vm.newDownloaderAvailable.collectAsStateWithLifecycle(
false false
) )
val androidContext = LocalContext.current val androidContext = LocalContext.current
@@ -307,14 +307,14 @@ fun DashboardScreen(
) )
} }
} else null, } else null,
if (showNewDownloaderPluginsNotification) { if (showNewDownloaderNotification) {
{ {
NotificationCard( NotificationCard(
text = stringResource(R.string.new_downloader_plugins_notification), text = stringResource(R.string.new_downloader_notification),
icon = Icons.Outlined.Download, icon = Icons.Outlined.Download,
modifier = Modifier.clickable(onClick = onDownloaderPluginClick), modifier = Modifier.clickable(onClick = onDownloaderClick),
actions = { actions = {
TextButton(onClick = vm::ignoreNewDownloaderPlugins) { TextButton(onClick = vm::ignoreNewDownloader) {
Text(stringResource(R.string.dismiss)) Text(stringResource(R.string.dismiss))
} }
} }

2
app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt
View File

@@ -148,7 +148,7 @@ fun PatcherScreen(
}, },
title = { Text(title) }, title = { Text(title) },
text = { text = {
Text(stringResource(R.string.plugin_activity_dialog_body)) Text(stringResource(R.string.downloader_activity_dialog_body))
} }
) )
} }

36
app/src/main/java/app/revanced/manager/ui/screen/SelectedAppInfoScreen.kt
View File

@@ -39,7 +39,7 @@ import app.revanced.manager.R
import app.revanced.manager.data.platform.NetworkInfo import app.revanced.manager.data.platform.NetworkInfo
import app.revanced.manager.data.room.apps.installed.InstallType import app.revanced.manager.data.room.apps.installed.InstallType
import app.revanced.manager.data.room.apps.installed.InstalledApp import app.revanced.manager.data.room.apps.installed.InstalledApp
import app.revanced.manager.network.downloader.LoadedDownloaderPlugin import app.revanced.manager.network.downloader.LoadedDownloader
import app.revanced.manager.ui.component.AlertDialogExtended import app.revanced.manager.ui.component.AlertDialogExtended
import app.revanced.manager.ui.component.AppInfo import app.revanced.manager.ui.component.AppInfo
import app.revanced.manager.ui.component.AppTopBar import app.revanced.manager.ui.component.AppTopBar
@@ -86,7 +86,7 @@ fun SelectedAppInfoScreen(
val launcher = rememberLauncherForActivityResult( val launcher = rememberLauncherForActivityResult(
contract = ActivityResultContracts.StartActivityForResult(), contract = ActivityResultContracts.StartActivityForResult(),
onResult = vm::handlePluginActivityResult onResult = vm::handleDownloaderActivityResult
) )
EventEffect(flow = vm.launchActivityFlow) { intent -> EventEffect(flow = vm.launchActivityFlow) { intent ->
launcher.launch(intent) launcher.launch(intent)
@@ -140,22 +140,22 @@ fun SelectedAppInfoScreen(
}, },
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
) { paddingValues -> ) { paddingValues ->
val plugins by vm.plugins.collectAsStateWithLifecycle(emptyList()) val downloader by vm.downloader.collectAsStateWithLifecycle(emptyList())
if (vm.showSourceSelector) { if (vm.showSourceSelector) {
val requiredVersion by vm.requiredVersion.collectAsStateWithLifecycle(null) val requiredVersion by vm.requiredVersion.collectAsStateWithLifecycle(null)
AppSourceSelectorDialog( AppSourceSelectorDialog(
plugins = plugins, downloader = downloader,
installedApp = vm.installedAppData, installedApp = vm.installedAppData,
searchApp = SelectedApp.Search( searchApp = SelectedApp.Search(
vm.packageName, vm.packageName,
vm.desiredVersion vm.desiredVersion
), ),
activeSearchJob = vm.activePluginAction, activeSearchJob = vm.activeDownloaderAction,
hasRoot = vm.hasRoot, hasRoot = vm.hasRoot,
onDismissRequest = vm::dismissSourceSelector, onDismissRequest = vm::dismissSourceSelector,
onSelectPlugin = vm::searchUsingPlugin, onSelectDownloader = vm::searchUsingDownloader,
requiredVersion = requiredVersion, requiredVersion = requiredVersion,
onSelect = { onSelect = {
vm.selectedApp = it vm.selectedApp = it
@@ -201,8 +201,8 @@ fun SelectedAppInfoScreen(
is SelectedApp.Installed -> stringResource(R.string.apk_source_installed) is SelectedApp.Installed -> stringResource(R.string.apk_source_installed)
is SelectedApp.Download -> stringResource( is SelectedApp.Download -> stringResource(
R.string.apk_source_downloader, R.string.apk_source_downloader,
plugins.find { it.packageName == app.data.pluginPackageName }?.name downloader.find { it.packageName == app.data.downloaderPackageName }?.name
?: app.data.pluginPackageName ?: app.data.downloaderPackageName
) )
is SelectedApp.Local -> stringResource(R.string.apk_source_local) is SelectedApp.Local -> stringResource(R.string.apk_source_local)
@@ -279,14 +279,14 @@ private fun PageItem(@StringRes title: Int, description: String, onClick: () ->
@Composable @Composable
private fun AppSourceSelectorDialog( private fun AppSourceSelectorDialog(
plugins: List<LoadedDownloaderPlugin>, downloader: List<LoadedDownloader>,
installedApp: Pair<SelectedApp.Installed, InstalledApp?>?, installedApp: Pair<SelectedApp.Installed, InstalledApp?>?,
searchApp: SelectedApp.Search, searchApp: SelectedApp.Search,
activeSearchJob: String?, activeSearchJob: String?,
hasRoot: Boolean, hasRoot: Boolean,
requiredVersion: String?, requiredVersion: String?,
onDismissRequest: () -> Unit, onDismissRequest: () -> Unit,
onSelectPlugin: (LoadedDownloaderPlugin) -> Unit, onSelectDownloader: (LoadedDownloader) -> Unit,
onSelect: (SelectedApp) -> Unit, onSelect: (SelectedApp) -> Unit,
) { ) {
val canSelect = activeSearchJob == null val canSelect = activeSearchJob == null
@@ -303,15 +303,15 @@ private fun AppSourceSelectorDialog(
text = { text = {
LazyColumn { LazyColumn {
item(key = "auto") { item(key = "auto") {
val hasPlugins = plugins.isNotEmpty() val hasDownloader = downloader.isNotEmpty()
ListItem( ListItem(
modifier = Modifier modifier = Modifier
.clickable(enabled = canSelect && hasPlugins) { onSelect(searchApp) } .clickable(enabled = canSelect && hasDownloader) { onSelect(searchApp) }
.enabled(hasPlugins), .enabled(hasDownloader),
headlineContent = { Text(stringResource(R.string.app_source_dialog_option_auto)) }, headlineContent = { Text(stringResource(R.string.app_source_dialog_option_auto)) },
supportingContent = { supportingContent = {
Text( Text(
if (hasPlugins) if (hasDownloader)
stringResource(R.string.app_source_dialog_option_auto_description) stringResource(R.string.app_source_dialog_option_auto_description)
else else
stringResource(R.string.app_source_dialog_option_auto_unavailable) stringResource(R.string.app_source_dialog_option_auto_unavailable)
@@ -349,11 +349,11 @@ private fun AppSourceSelectorDialog(
} }
} }
items(plugins, key = { "plugin_${it.packageName}" }) { plugin -> items(downloader, key = { "downloader_${it.packageName}" }) { downloader ->
ListItem( ListItem(
modifier = Modifier.clickable(enabled = canSelect) { onSelectPlugin(plugin) }, modifier = Modifier.clickable(enabled = canSelect) { onSelectDownloader(downloader) },
headlineContent = { Text(plugin.name) }, headlineContent = { Text(downloader.name) },
trailingContent = (@Composable { LoadingIndicator() }).takeIf { activeSearchJob == plugin.packageName }, trailingContent = (@Composable { LoadingIndicator() }).takeIf { activeSearchJob == downloader.packageName },
colors = transparentListItemColors colors = transparentListItemColors
) )
} }

56
app/src/main/java/app/revanced/manager/ui/screen/settings/DownloadsSettingsScreen.kt
View File

@@ -39,7 +39,7 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import app.revanced.manager.R import app.revanced.manager.R
import app.revanced.manager.network.downloader.DownloaderPluginState import app.revanced.manager.network.downloader.DownloaderState
import app.revanced.manager.ui.component.AppLabel import app.revanced.manager.ui.component.AppLabel
import app.revanced.manager.ui.component.AppTopBar import app.revanced.manager.ui.component.AppTopBar
import app.revanced.manager.ui.component.ConfirmDialog import app.revanced.manager.ui.component.ConfirmDialog
@@ -60,7 +60,7 @@ fun DownloadsSettingsScreen(
) { ) {
val context = LocalContext.current val context = LocalContext.current
val downloadedApps by viewModel.downloadedApps.collectAsStateWithLifecycle(emptyList()) val downloadedApps by viewModel.downloadedApps.collectAsStateWithLifecycle(emptyList())
val pluginStates by viewModel.downloaderPluginStates.collectAsStateWithLifecycle() val downloaderStates by viewModel.downloaderStates.collectAsStateWithLifecycle()
val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState()) val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
var showDeleteConfirmationDialog by rememberSaveable { mutableStateOf(false) } var showDeleteConfirmationDialog by rememberSaveable { mutableStateOf(false) }
@@ -68,8 +68,8 @@ fun DownloadsSettingsScreen(
ConfirmDialog( ConfirmDialog(
onDismiss = { showDeleteConfirmationDialog = false }, onDismiss = { showDeleteConfirmationDialog = false },
onConfirm = { viewModel.deleteApps() }, onConfirm = { viewModel.deleteApps() },
title = stringResource(R.string.downloader_plugin_delete_apps_title), title = stringResource(R.string.downloader_delete_apps_title),
description = stringResource(R.string.downloader_plugin_delete_apps_description), description = stringResource(R.string.downloader_delete_apps_description),
icon = Icons.Outlined.Delete icon = Icons.Outlined.Delete
) )
} }
@@ -92,17 +92,17 @@ fun DownloadsSettingsScreen(
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
) { paddingValues -> ) { paddingValues ->
PullToRefreshBox( PullToRefreshBox(
onRefresh = viewModel::refreshPlugins, onRefresh = viewModel::refreshDownloader,
isRefreshing = viewModel.isRefreshingPlugins, isRefreshing = viewModel.isRefreshingDownloader,
modifier = Modifier.padding(paddingValues) modifier = Modifier.padding(paddingValues)
) { ) {
LazyColumnWithScrollbar( LazyColumnWithScrollbar(
modifier = Modifier.fillMaxSize() modifier = Modifier.fillMaxSize()
) { ) {
item { item {
GroupHeader(stringResource(R.string.downloader_plugins)) GroupHeader(stringResource(R.string.downloader))
} }
pluginStates.forEach { (packageName, state) -> downloaderStates.forEach { (packageName, state) ->
item(key = packageName) { item(key = packageName) {
var showDialog by rememberSaveable { var showDialog by rememberSaveable {
mutableStateOf(false) mutableStateOf(false)
@@ -135,39 +135,39 @@ fun DownloadsSettingsScreen(
} }
when (state) { when (state) {
is DownloaderPluginState.Loaded -> TrustDialog( is DownloaderState.Loaded -> TrustDialog(
title = R.string.downloader_plugin_revoke_trust_dialog_title, title = R.string.downloader_revoke_trust_dialog_title,
body = stringResource( body = stringResource(
R.string.downloader_plugin_trust_dialog_body, R.string.downloader_trust_dialog_body,
packageName, packageName,
signature signature
), ),
pluginName = appName, downloaderName = appName,
signature = signature, signature = signature,
onDismiss = ::dismiss, onDismiss = ::dismiss,
onConfirm = { onConfirm = {
viewModel.revokePluginTrust(packageName) viewModel.revokeDownloaderTrust(packageName)
dismiss() dismiss()
} }
) )
is DownloaderPluginState.Failed -> ExceptionViewerDialog( is DownloaderState.Failed -> ExceptionViewerDialog(
text = remember(state.throwable) { text = remember(state.throwable) {
state.throwable.stackTraceToString() state.throwable.stackTraceToString()
}, },
onDismiss = ::dismiss onDismiss = ::dismiss
) )
is DownloaderPluginState.Untrusted -> TrustDialog( is DownloaderState.Untrusted -> TrustDialog(
title = R.string.downloader_plugin_trust_dialog_title, title = R.string.downloader_trust_dialog_title,
body = stringResource( body = stringResource(
R.string.downloader_plugin_trust_dialog_body R.string.downloader_trust_dialog_body
), ),
pluginName = appName, downloaderName = appName,
signature = signature, signature = signature,
onDismiss = ::dismiss, onDismiss = ::dismiss,
onConfirm = { onConfirm = {
viewModel.trustPlugin(packageName) viewModel.trustDownloader(packageName)
dismiss() dismiss()
} }
) )
@@ -184,19 +184,19 @@ fun DownloadsSettingsScreen(
}, },
supportingContent = stringResource( supportingContent = stringResource(
when (state) { when (state) {
is DownloaderPluginState.Loaded -> R.string.downloader_plugin_state_trusted is DownloaderState.Loaded -> R.string.downloader_state_trusted
is DownloaderPluginState.Failed -> R.string.downloader_plugin_state_failed is DownloaderState.Failed -> R.string.downloader_state_failed
is DownloaderPluginState.Untrusted -> R.string.downloader_plugin_state_untrusted is DownloaderState.Untrusted -> R.string.downloader_state_untrusted
} }
), ),
trailingContent = { Text(packageInfo.versionName!!) } trailingContent = { Text(packageInfo.versionName!!) }
) )
} }
} }
if (pluginStates.isEmpty()) { if (downloaderStates.isEmpty()) {
item { item {
Text( Text(
stringResource(R.string.downloader_no_plugins_installed), stringResource(R.string.no_downloader_installed),
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
textAlign = TextAlign.Center textAlign = TextAlign.Center
) )
@@ -240,7 +240,7 @@ fun DownloadsSettingsScreen(
private fun TrustDialog( private fun TrustDialog(
@StringRes title: Int, @StringRes title: Int,
body: String, body: String,
pluginName: String, downloaderName: String,
signature: String, signature: String,
onDismiss: () -> Unit, onDismiss: () -> Unit,
onConfirm: () -> Unit onConfirm: () -> Unit
@@ -268,8 +268,8 @@ private fun TrustDialog(
) { ) {
Text( Text(
stringResource( stringResource(
R.string.downloader_plugin_trust_dialog_plugin, R.string.downloader_trust_dialog_name,
pluginName downloaderName
), ),
) )
OutlinedCard( OutlinedCard(
@@ -279,7 +279,7 @@ private fun TrustDialog(
) { ) {
Text( Text(
stringResource( stringResource(
R.string.downloader_plugin_trust_dialog_signature, R.string.downloader_trust_dialog_signature,
signature.chunked(2).joinToString(" ") signature.chunked(2).joinToString(" ")
), modifier = Modifier.padding(12.dp) ), modifier = Modifier.padding(12.dp)
) )

16
app/src/main/java/app/revanced/manager/ui/viewmodel/DashboardViewModel.kt
View File

@@ -7,7 +7,6 @@ import android.net.Uri
import android.os.Build import android.os.Build
import android.os.PowerManager import android.os.PowerManager
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateListOf
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.core.content.getSystemService import androidx.core.content.getSystemService
@@ -15,15 +14,12 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import app.revanced.manager.R import app.revanced.manager.R
import app.revanced.manager.data.platform.NetworkInfo import app.revanced.manager.data.platform.NetworkInfo
import app.revanced.manager.domain.bundles.PatchBundleSource
import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.asRemoteOrNull import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.asRemoteOrNull
import app.revanced.manager.domain.bundles.RemotePatchBundle
import app.revanced.manager.domain.manager.PreferencesManager import app.revanced.manager.domain.manager.PreferencesManager
import app.revanced.manager.domain.repository.DownloaderPluginRepository import app.revanced.manager.domain.repository.DownloaderRepository
import app.revanced.manager.domain.repository.PatchBundleRepository import app.revanced.manager.domain.repository.PatchBundleRepository
import app.revanced.manager.network.api.ReVancedAPI import app.revanced.manager.network.api.ReVancedAPI
import app.revanced.manager.util.PM import app.revanced.manager.util.PM
import app.revanced.manager.util.toast
import app.revanced.manager.util.uiSafe import app.revanced.manager.util.uiSafe
import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.first
@@ -34,7 +30,7 @@ import kotlinx.coroutines.launch
class DashboardViewModel( class DashboardViewModel(
private val app: Application, private val app: Application,
private val patchBundleRepository: PatchBundleRepository, private val patchBundleRepository: PatchBundleRepository,
private val downloaderPluginRepository: DownloaderPluginRepository, private val downloaderRepository: DownloaderRepository,
private val reVancedAPI: ReVancedAPI, private val reVancedAPI: ReVancedAPI,
private val networkInfo: NetworkInfo, private val networkInfo: NetworkInfo,
val prefs: PreferencesManager, val prefs: PreferencesManager,
@@ -45,8 +41,8 @@ class DashboardViewModel(
private val contentResolver: ContentResolver = app.contentResolver private val contentResolver: ContentResolver = app.contentResolver
private val powerManager = app.getSystemService<PowerManager>()!! private val powerManager = app.getSystemService<PowerManager>()!!
val newDownloaderPluginsAvailable = val newDownloaderAvailable =
downloaderPluginRepository.newPluginPackageNames.map { it.isNotEmpty() } downloaderRepository.newDownloaderPackageNames.map { it.isNotEmpty() }
/** /**
* Android 11 kills the app process after granting the "install apps" permission, which is a problem for the patcher screen. * Android 11 kills the app process after granting the "install apps" permission, which is a problem for the patcher screen.
@@ -71,8 +67,8 @@ class DashboardViewModel(
} }
} }
fun ignoreNewDownloaderPlugins() = viewModelScope.launch { fun ignoreNewDownloader() = viewModelScope.launch {
downloaderPluginRepository.acknowledgeAllNewPlugins() downloaderRepository.acknowledgeAllNewDownloader()
} }
private suspend fun checkForManagerUpdates() { private suspend fun checkForManagerUpdates() {

25
app/src/main/java/app/revanced/manager/ui/viewmodel/DownloadsViewModel.kt
View File

@@ -1,6 +1,5 @@
package app.revanced.manager.ui.viewmodel package app.revanced.manager.ui.viewmodel
import android.content.pm.PackageInfo
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
@@ -8,7 +7,7 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import app.revanced.manager.data.room.apps.downloaded.DownloadedApp import app.revanced.manager.data.room.apps.downloaded.DownloadedApp
import app.revanced.manager.domain.repository.DownloadedAppRepository import app.revanced.manager.domain.repository.DownloadedAppRepository
import app.revanced.manager.domain.repository.DownloaderPluginRepository import app.revanced.manager.domain.repository.DownloaderRepository
import app.revanced.manager.util.PM import app.revanced.manager.util.PM
import app.revanced.manager.util.mutableStateSetOf import app.revanced.manager.util.mutableStateSetOf
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
@@ -19,10 +18,10 @@ import kotlinx.coroutines.withContext
class DownloadsViewModel( class DownloadsViewModel(
private val downloadedAppRepository: DownloadedAppRepository, private val downloadedAppRepository: DownloadedAppRepository,
private val downloaderPluginRepository: DownloaderPluginRepository, private val downloaderRepository: DownloaderRepository,
val pm: PM val pm: PM
) : ViewModel() { ) : ViewModel() {
val downloaderPluginStates = downloaderPluginRepository.pluginStates val downloaderStates = downloaderRepository.downloaderStates
val downloadedApps = downloadedAppRepository.getAll().map { downloadedApps -> val downloadedApps = downloadedAppRepository.getAll().map { downloadedApps ->
downloadedApps.sortedWith( downloadedApps.sortedWith(
compareBy<DownloadedApp> { compareBy<DownloadedApp> {
@@ -32,7 +31,7 @@ class DownloadsViewModel(
} }
val appSelection = mutableStateSetOf<DownloadedApp>() val appSelection = mutableStateSetOf<DownloadedApp>()
var isRefreshingPlugins by mutableStateOf(false) var isRefreshingDownloader by mutableStateOf(false)
private set private set
fun toggleApp(downloadedApp: DownloadedApp) { fun toggleApp(downloadedApp: DownloadedApp) {
@@ -52,17 +51,17 @@ class DownloadsViewModel(
} }
} }
fun refreshPlugins() = viewModelScope.launch { fun refreshDownloader() = viewModelScope.launch {
isRefreshingPlugins = true isRefreshingDownloader = true
downloaderPluginRepository.reload() downloaderRepository.reload()
isRefreshingPlugins = false isRefreshingDownloader = false
} }
fun trustPlugin(packageName: String) = viewModelScope.launch { fun trustDownloader(packageName: String) = viewModelScope.launch {
downloaderPluginRepository.trustPackage(packageName) downloaderRepository.trustPackage(packageName)
} }
fun revokePluginTrust(packageName: String) = viewModelScope.launch { fun revokeDownloaderTrust(packageName: String) = viewModelScope.launch {
downloaderPluginRepository.revokeTrustForPackage(packageName) downloaderRepository.revokeTrustForPackage(packageName)
} }
} }

10
app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherViewModel.kt
View File

@@ -34,8 +34,8 @@ import app.revanced.manager.patcher.StepId
import app.revanced.manager.patcher.logger.LogLevel import app.revanced.manager.patcher.logger.LogLevel
import app.revanced.manager.patcher.logger.Logger import app.revanced.manager.patcher.logger.Logger
import app.revanced.manager.patcher.worker.PatcherWorker import app.revanced.manager.patcher.worker.PatcherWorker
import app.revanced.manager.plugin.downloader.PluginHostApi import app.revanced.manager.downloader.DownloaderHostApi
import app.revanced.manager.plugin.downloader.UserInteractionException import app.revanced.manager.downloader.UserInteractionException
import app.revanced.manager.ui.model.InstallerModel import app.revanced.manager.ui.model.InstallerModel
import app.revanced.manager.ui.model.SelectedApp import app.revanced.manager.ui.model.SelectedApp
import app.revanced.manager.ui.model.State import app.revanced.manager.ui.model.State
@@ -79,7 +79,7 @@ import java.io.File
import java.nio.file.Files import java.nio.file.Files
import java.time.Duration import java.time.Duration
@OptIn(SavedStateHandleSaveableApi::class, PluginHostApi::class) @OptIn(SavedStateHandleSaveableApi::class, DownloaderHostApi::class)
class PatcherViewModel( class PatcherViewModel(
private val input: Patcher.ViewModelParams private val input: Patcher.ViewModelParams
) : ViewModel(), KoinComponent, InstallerModel { ) : ViewModel(), KoinComponent, InstallerModel {
@@ -184,13 +184,13 @@ class PatcherViewModel(
input.options, input.options,
logger, logger,
setInputFile = { withContext(Dispatchers.Main) { inputFile = it } }, setInputFile = { withContext(Dispatchers.Main) { inputFile = it } },
handleStartActivityRequest = { plugin, intent -> handleStartActivityRequest = { downloader, intent ->
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
if (currentActivityRequest != null) throw Exception("Another request is already pending.") if (currentActivityRequest != null) throw Exception("Another request is already pending.")
try { try {
// Wait for the dialog interaction. // Wait for the dialog interaction.
val accepted = with(CompletableDeferred<Boolean>()) { val accepted = with(CompletableDeferred<Boolean>()) {
currentActivityRequest = this to plugin.name currentActivityRequest = this to downloader.name
await() await()
} }

50
app/src/main/java/app/revanced/manager/ui/viewmodel/SelectedAppInfoViewModel.kt
View File

@@ -22,19 +22,19 @@ import app.revanced.manager.R
import app.revanced.manager.data.room.apps.installed.InstalledApp import app.revanced.manager.data.room.apps.installed.InstalledApp
import app.revanced.manager.domain.installer.RootInstaller import app.revanced.manager.domain.installer.RootInstaller
import app.revanced.manager.domain.manager.PreferencesManager import app.revanced.manager.domain.manager.PreferencesManager
import app.revanced.manager.domain.repository.DownloaderPluginRepository import app.revanced.manager.domain.repository.DownloaderRepository
import app.revanced.manager.domain.repository.InstalledAppRepository import app.revanced.manager.domain.repository.InstalledAppRepository
import app.revanced.manager.domain.repository.PatchBundleRepository import app.revanced.manager.domain.repository.PatchBundleRepository
import app.revanced.manager.domain.repository.PatchOptionsRepository import app.revanced.manager.domain.repository.PatchOptionsRepository
import app.revanced.manager.domain.repository.PatchSelectionRepository import app.revanced.manager.domain.repository.PatchSelectionRepository
import app.revanced.manager.patcher.patch.PatchBundleInfo import app.revanced.manager.patcher.patch.PatchBundleInfo
import app.revanced.manager.patcher.patch.PatchBundleInfo.Extensions.toPatchSelection import app.revanced.manager.patcher.patch.PatchBundleInfo.Extensions.toPatchSelection
import app.revanced.manager.network.downloader.LoadedDownloaderPlugin import app.revanced.manager.network.downloader.LoadedDownloader
import app.revanced.manager.network.downloader.ParceledDownloaderData import app.revanced.manager.network.downloader.ParceledDownloaderData
import app.revanced.manager.patcher.patch.PatchBundleInfo.Extensions.requiredOptionsSet import app.revanced.manager.patcher.patch.PatchBundleInfo.Extensions.requiredOptionsSet
import app.revanced.manager.plugin.downloader.GetScope import app.revanced.manager.downloader.GetScope
import app.revanced.manager.plugin.downloader.PluginHostApi import app.revanced.manager.downloader.DownloaderHostApi
import app.revanced.manager.plugin.downloader.UserInteractionException import app.revanced.manager.downloader.UserInteractionException
import app.revanced.manager.ui.model.SelectedApp import app.revanced.manager.ui.model.SelectedApp
import app.revanced.manager.ui.model.navigation.Patcher import app.revanced.manager.ui.model.navigation.Patcher
import app.revanced.manager.ui.model.navigation.SelectedApplicationInfo import app.revanced.manager.ui.model.navigation.SelectedApplicationInfo
@@ -59,7 +59,7 @@ import kotlinx.parcelize.Parcelize
import org.koin.core.component.KoinComponent import org.koin.core.component.KoinComponent
import org.koin.core.component.get import org.koin.core.component.get
@OptIn(SavedStateHandleSaveableApi::class, PluginHostApi::class) @OptIn(SavedStateHandleSaveableApi::class, DownloaderHostApi::class)
class SelectedAppInfoViewModel( class SelectedAppInfoViewModel(
input: SelectedApplicationInfo.ViewModelParams input: SelectedApplicationInfo.ViewModelParams
) : ViewModel(), KoinComponent { ) : ViewModel(), KoinComponent {
@@ -67,13 +67,13 @@ class SelectedAppInfoViewModel(
private val bundleRepository: PatchBundleRepository = get() private val bundleRepository: PatchBundleRepository = get()
private val selectionRepository: PatchSelectionRepository = get() private val selectionRepository: PatchSelectionRepository = get()
private val optionsRepository: PatchOptionsRepository = get() private val optionsRepository: PatchOptionsRepository = get()
private val pluginsRepository: DownloaderPluginRepository = get() private val downloaderRepository: DownloaderRepository = get()
private val installedAppRepository: InstalledAppRepository = get() private val installedAppRepository: InstalledAppRepository = get()
private val rootInstaller: RootInstaller = get() private val rootInstaller: RootInstaller = get()
private val pm: PM = get() private val pm: PM = get()
private val savedStateHandle: SavedStateHandle = get() private val savedStateHandle: SavedStateHandle = get()
val prefs: PreferencesManager = get() val prefs: PreferencesManager = get()
val plugins = pluginsRepository.loadedPluginsFlow val downloader = downloaderRepository.loadedDownloaderFlow
val desiredVersion = input.app.version val desiredVersion = input.app.version
val packageName = input.app.packageName val packageName = input.app.packageName
@@ -160,15 +160,15 @@ class SelectedAppInfoViewModel(
var showSourceSelector by mutableStateOf(false) var showSourceSelector by mutableStateOf(false)
private set private set
private var pluginAction: Pair<LoadedDownloaderPlugin, Job>? by mutableStateOf(null) private var downloaderAction: Pair<LoadedDownloader, Job>? by mutableStateOf(null)
val activePluginAction get() = pluginAction?.first?.packageName val activeDownloaderAction get() = downloaderAction?.first?.packageName
private var launchedActivity by mutableStateOf<CompletableDeferred<ActivityResult>?>(null) private var launchedActivity by mutableStateOf<CompletableDeferred<ActivityResult>?>(null)
private val launchActivityChannel = Channel<Intent>() private val launchActivityChannel = Channel<Intent>()
val launchActivityFlow = launchActivityChannel.receiveAsFlow() val launchActivityFlow = launchActivityChannel.receiveAsFlow()
val errorFlow = combine(plugins, snapshotFlow { selectedApp }) { pluginsList, app -> val errorFlow = combine(downloader, snapshotFlow { selectedApp }) { downloaderList, app ->
when { when {
app is SelectedApp.Search && pluginsList.isEmpty() -> Error.NoPlugins app is SelectedApp.Search && downloaderList.isEmpty() -> Error.NoDownloader
else -> null else -> null
} }
} }
@@ -178,23 +178,23 @@ class SelectedAppInfoViewModel(
showSourceSelector = true showSourceSelector = true
} }
private fun cancelPluginAction() { private fun cancelDownloaderAction() {
pluginAction?.second?.cancel() downloaderAction?.second?.cancel()
pluginAction = null downloaderAction = null
} }
fun dismissSourceSelector() { fun dismissSourceSelector() {
cancelPluginAction() cancelDownloaderAction()
showSourceSelector = false showSourceSelector = false
} }
fun searchUsingPlugin(plugin: LoadedDownloaderPlugin) { fun searchUsingDownloader(downloader: LoadedDownloader) {
cancelPluginAction() cancelDownloaderAction()
pluginAction = plugin to viewModelScope.launch { downloaderAction = downloader to viewModelScope.launch {
try { try {
val scope = object : GetScope { val scope = object : GetScope {
override val hostPackageName = app.packageName override val hostPackageName = app.packageName
override val pluginPackageName = plugin.packageName override val downloaderPackageName = downloader.packageName
override suspend fun requestStartActivity(intent: Intent) = override suspend fun requestStartActivity(intent: Intent) =
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
if (launchedActivity != null) error("Previous activity has not finished") if (launchedActivity != null) error("Previous activity has not finished")
@@ -219,7 +219,7 @@ class SelectedAppInfoViewModel(
} }
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
plugin.get(scope, packageName, desiredVersion) downloader.get(scope, packageName, desiredVersion)
}?.let { (data, version) -> }?.let { (data, version) ->
if (desiredVersion != null && version != desiredVersion) { if (desiredVersion != null && version != desiredVersion) {
app.toast(app.getString(R.string.downloader_invalid_version)) app.toast(app.getString(R.string.downloader_invalid_version))
@@ -228,7 +228,7 @@ class SelectedAppInfoViewModel(
selectedApp = SelectedApp.Download( selectedApp = SelectedApp.Download(
packageName, packageName,
version, version,
ParceledDownloaderData(plugin, data) ParceledDownloaderData(downloader, data)
) )
} ?: app.toast(app.getString(R.string.downloader_app_not_found)) } ?: app.toast(app.getString(R.string.downloader_app_not_found))
} catch (e: UserInteractionException.Activity) { } catch (e: UserInteractionException.Activity) {
@@ -239,13 +239,13 @@ class SelectedAppInfoViewModel(
app.toast(app.getString(R.string.downloader_error, e.simpleMessage())) app.toast(app.getString(R.string.downloader_error, e.simpleMessage()))
Log.e(tag, "Downloader.get threw an exception", e) Log.e(tag, "Downloader.get threw an exception", e)
} finally { } finally {
pluginAction = null downloaderAction = null
dismissSourceSelector() dismissSourceSelector()
} }
} }
} }
fun handlePluginActivityResult(result: ActivityResult) { fun handleDownloaderActivityResult(result: ActivityResult) {
launchedActivity?.complete(result) launchedActivity?.complete(result)
} }
@@ -307,7 +307,7 @@ class SelectedAppInfoViewModel(
} }
enum class Error(@param:StringRes val resourceId: Int) { enum class Error(@param:StringRes val resourceId: Int) {
NoPlugins(R.string.downloader_no_plugins_available) NoDownloader(R.string.no_downloader_available)
} }
private companion object { private companion object {

38
app/src/main/res/values/strings.xml
View File

@@ -19,8 +19,8 @@ Second \"item\" text"</string>
<string name="cli">CLI</string> <string name="cli">CLI</string>
<string name="manager">Manager</string> <string name="manager">Manager</string>
<string name="plugin_host_permission_label">ReVanced Manager plugin host</string> <string name="downloader_host_permission_label">ReVanced Manager downloader host</string>
<string name="plugin_host_permission_description">Used to control access to ReVanced Manager plugins. Only ReVanced Manager has this.</string> <string name="downloader_host_permission_description">Used to control access to ReVanced Manager downloader. Only ReVanced Manager has this.</string>
<string name="toast_copied_to_clipboard">Copied!</string> <string name="toast_copied_to_clipboard">Copied!</string>
<string name="copy_to_clipboard">Copy to clipboard</string> <string name="copy_to_clipboard">Copy to clipboard</string>
@@ -30,7 +30,7 @@ Second \"item\" text"</string>
<string name="select_app">Select an app</string> <string name="select_app">Select an app</string>
<string name="patches_count_selected">%1$d/%2$d selected</string> <string name="patches_count_selected">%1$d/%2$d selected</string>
<string name="new_downloader_plugins_notification">New downloader plugins available. Click here to configure them.</string> <string name="new_downloader_notification">New downloader available. Click here to configure them.</string>
<string name="unsupported_architecture_warning">Patching on this device architecture is unsupported and will most likely fail.</string> <string name="unsupported_architecture_warning">Patching on this device architecture is unsupported and will most likely fail.</string>
<string name="import_">Import</string> <string name="import_">Import</string>
@@ -56,7 +56,7 @@ Second \"item\" text"</string>
<string name="app_source_dialog_title">Select source</string> <string name="app_source_dialog_title">Select source</string>
<string name="app_source_dialog_option_auto">Auto</string> <string name="app_source_dialog_option_auto">Auto</string>
<string name="app_source_dialog_option_auto_description">Use all available downloader to download the app</string> <string name="app_source_dialog_option_auto_description">Use all available downloader to download the app</string>
<string name="app_source_dialog_option_auto_unavailable">No plugins available</string> <string name="app_source_dialog_option_auto_unavailable">No downloader available</string>
<string name="app_source_dialog_option_installed_no_root">Mounted apps cannot be patched again without root access</string> <string name="app_source_dialog_option_installed_no_root">Mounted apps cannot be patched again without root access</string>
<string name="app_source_dialog_option_installed_version_not_suggested">Version %s does not match the suggested version</string> <string name="app_source_dialog_option_installed_version_not_suggested">Version %s does not match the suggested version</string>
@@ -87,7 +87,7 @@ Second \"item\" text"</string>
<string name="updates">Updates</string> <string name="updates">Updates</string>
<string name="updates_description">Check for updates and view changelogs</string> <string name="updates_description">Check for updates and view changelogs</string>
<string name="downloads">Downloads</string> <string name="downloads">Downloads</string>
<string name="downloads_description">Downloader plugins and downloaded apps</string> <string name="downloads_description">Downloader and downloaded apps</string>
<string name="import_export">Import &amp; export</string> <string name="import_export">Import &amp; export</string>
<string name="import_export_description">Keystore, patch options and selection</string> <string name="import_export_description">Keystore, patch options and selection</string>
<string name="advanced">Advanced</string> <string name="advanced">Advanced</string>
@@ -175,17 +175,17 @@ You will not be able to update the previously installed apps from this source."<
<string name="patch_options_reset_all">Reset patch options globally</string> <string name="patch_options_reset_all">Reset patch options globally</string>
<string name="patch_options_reset_all_dialog_description">You are about to reset all patch options. You will have to reapply each option again.</string> <string name="patch_options_reset_all_dialog_description">You are about to reset all patch options. You will have to reapply each option again.</string>
<string name="patch_options_reset_all_description">Resets all patch options</string> <string name="patch_options_reset_all_description">Resets all patch options</string>
<string name="downloader_plugins">Plugins</string> <string name="downloader">Downloader</string>
<string name="downloader_plugin_state_trusted">Trusted</string> <string name="downloader_state_trusted">Trusted</string>
<string name="downloader_plugin_state_failed">Failed to load. Click for more details</string> <string name="downloader_state_failed">Failed to load. Click for more details</string>
<string name="downloader_plugin_state_untrusted">Untrusted</string> <string name="downloader_state_untrusted">Untrusted</string>
<string name="downloader_plugin_trust_dialog_title">Trust plugin?</string> <string name="downloader_trust_dialog_title">Trust downloader?</string>
<string name="downloader_plugin_revoke_trust_dialog_title">Revoke trust?</string> <string name="downloader_revoke_trust_dialog_title">Revoke trust?</string>
<string name="downloader_plugin_trust_dialog_body">Continuing will allow this plugin to run on your system.\n\nOnly enable this plugin if you trust it. Plugins can execute arbitrary code and may compromise your device.</string> <string name="downloader_trust_dialog_body">Continuing will allow this downloader to run on your system.\n\nOnly enable this downloader if you trust it. Downloader can execute arbitrary code and may compromise your device.</string>
<string name="downloader_plugin_trust_dialog_signature">Signature:\n\n%s</string> <string name="downloader_trust_dialog_signature">Signature:\n\n%s</string>
<string name="downloader_plugin_trust_dialog_plugin">Plugin:\n%s</string> <string name="downloader_trust_dialog_name">Downloader:\n%s</string>
<string name="downloader_plugin_delete_apps_title">Delete selected apps</string> <string name="downloader_delete_apps_title">Delete selected apps</string>
<string name="downloader_plugin_delete_apps_description">Are you sure you want to delete the selected apps?</string> <string name="downloader_delete_apps_description">Are you sure you want to delete the selected apps?</string>
<string name="downloader_settings_no_apps">No downloaded apps found.</string> <string name="downloader_settings_no_apps">No downloaded apps found.</string>
<string name="search_apps">Search apps…</string> <string name="search_apps">Search apps…</string>
@@ -316,8 +316,8 @@ It is only compatible with the following version(s): %2$s"</string>
<string name="downloader_invalid_version">Downloader did not fetch the correct version</string> <string name="downloader_invalid_version">Downloader did not fetch the correct version</string>
<string name="downloader_app_not_found">Downloader did not find the app</string> <string name="downloader_app_not_found">Downloader did not find the app</string>
<string name="downloader_error">Downloader error: %s</string> <string name="downloader_error">Downloader error: %s</string>
<string name="downloader_no_plugins_installed">No downloader installed.</string> <string name="no_downloader_installed">No downloader installed.</string>
<string name="downloader_no_plugins_available">There are downloaders installed but none are trusted. Check your settings.</string> <string name="no_downloader_available">There are downloader installed but none are trusted. Check your settings.</string>
<string name="already_patched">Already patched</string> <string name="already_patched">Already patched</string>
<string name="patch_selector_sheet_filter_title">Filter</string> <string name="patch_selector_sheet_filter_title">Filter</string>
@@ -345,7 +345,7 @@ It is only compatible with the following version(s): %2$s"</string>
<string name="save_apk_success">APK Saved</string> <string name="save_apk_success">APK Saved</string>
<string name="sign_fail">Failed to sign APK: %s</string> <string name="sign_fail">Failed to sign APK: %s</string>
<string name="save_logs">Save logs</string> <string name="save_logs">Save logs</string>
<string name="plugin_activity_dialog_body">User interaction is required in order to proceed with this plugin.</string> <string name="downloader_activity_dialog_body">User interaction is required in order to proceed with this downloader.</string>
<string name="select_install_type">Select installation type</string> <string name="select_install_type">Select installation type</string>
<string name="patcher_step_group_preparing">Preparing</string> <string name="patcher_step_group_preparing">Preparing</string>