diff --git a/app/build.gradle b/app/build.gradle index e52d922ee..95ff6e7a2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,12 +21,12 @@ android { leanback { dimension "mode" versionCode 203 - versionName "20230731#2" + versionName "20230731#3" } mobile { dimension "mode" versionCode 203 - versionName "20230731#2" + versionName "20230731#3" } java { dimension "api" diff --git a/app/src/main/java/com/fongmi/android/tv/App.java b/app/src/main/java/com/fongmi/android/tv/App.java index 1cb1b25e8..01fd69a70 100644 --- a/app/src/main/java/com/fongmi/android/tv/App.java +++ b/app/src/main/java/com/fongmi/android/tv/App.java @@ -2,6 +2,7 @@ package com.fongmi.android.tv; import android.app.Activity; import android.app.Application; +import android.content.Context; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -76,10 +77,15 @@ public class App extends Application { this.activity = activity; } + @Override + protected void attachBaseContext(Context base) { + super.attachBaseContext(base); + Init.set(base); + } + @Override public void onCreate() { super.onCreate(); - Init.setContext(this); Notify.createChannel(); Logger.addLogAdapter(new AndroidLogAdapter()); OkHttp.get().setDoh(Doh.objectFrom(Setting.getDoh())); diff --git a/catvod/src/main/java/com/github/catvod/Init.java b/catvod/src/main/java/com/github/catvod/Init.java index 08713ac18..2d6207a2f 100644 --- a/catvod/src/main/java/com/github/catvod/Init.java +++ b/catvod/src/main/java/com/github/catvod/Init.java @@ -16,11 +16,11 @@ public class Init { return Loader.INSTANCE; } - public static Context context() { - return get().context.get(); + public static void set(Context context) { + get().context = new WeakReference<>(context); } - public static void setContext(Context context) { - get().context = new WeakReference<>(context); + public static Context context() { + return get().context.get(); } }