From 0be0ffd42abdf20e699a63e02b3474b82d798f24 Mon Sep 17 00:00:00 2001
From: oSumAtrIX <johan.melkonyan1@web.de>
Date: Sat, 22 Oct 2022 16:38:56 +0200
Subject: [PATCH] fix: revert removing getAppContext()

This reverts commit a061614d8626ef21f9bcddf7b5faabec50b40c4b.
---
 .../settingsmenu/ReVancedSettingsFragment.java         |  3 ++-
 .../app/revanced/integrations/utils/ReVancedUtils.java | 10 ++++++++++
 .../youtube/app/YouTubeTikTokRoot_Application.java     | 10 ++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/com/google/android/apps/youtube/app/YouTubeTikTokRoot_Application.java

diff --git a/app/src/main/java/app/revanced/integrations/settingsmenu/ReVancedSettingsFragment.java b/app/src/main/java/app/revanced/integrations/settingsmenu/ReVancedSettingsFragment.java
index ca05cd8a..99d0b144 100644
--- a/app/src/main/java/app/revanced/integrations/settingsmenu/ReVancedSettingsFragment.java
+++ b/app/src/main/java/app/revanced/integrations/settingsmenu/ReVancedSettingsFragment.java
@@ -18,6 +18,7 @@ import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 
+import com.google.android.apps.youtube.app.YouTubeTikTokRoot_Application;
 import com.google.android.apps.youtube.app.application.Shell_HomeActivity;
 
 import java.util.List;
@@ -173,7 +174,7 @@ public class ReVancedSettingsFragment extends PreferenceFragment {
     */
 
     private String getPackageName() {
-        Context context = ReVancedUtils.getContext();
+        Context context = YouTubeTikTokRoot_Application.getAppContext();
         if (context == null) {
             LogHelper.printException(ReVancedSettingsFragment.class, "Context is null, returning com.google.android.youtube!");
             return "com.google.android.youtube";
diff --git a/app/src/main/java/app/revanced/integrations/utils/ReVancedUtils.java b/app/src/main/java/app/revanced/integrations/utils/ReVancedUtils.java
index f5ffb961..c58f16fa 100644
--- a/app/src/main/java/app/revanced/integrations/utils/ReVancedUtils.java
+++ b/app/src/main/java/app/revanced/integrations/utils/ReVancedUtils.java
@@ -5,6 +5,8 @@ import android.content.res.Resources;
 import android.os.Handler;
 import android.os.Looper;
 
+import com.google.android.apps.youtube.app.YouTubeTikTokRoot_Application;
+
 import app.revanced.integrations.sponsorblock.player.PlayerType;
 
 public class ReVancedUtils {
@@ -15,6 +17,13 @@ public class ReVancedUtils {
     //Used by Integrations patch
     public static Context context;
     //Used by Integrations patch
+    public static Context getAppContext() {
+        if (context != null) {
+            return context;
+        }
+        LogHelper.printException(ReVancedUtils.class, "Context is null!");
+        return null;
+    }
 
     public static void setNewVideo(boolean started) {
         LogHelper.debug(ReVancedUtils.class, "New video started: " + started);
@@ -52,6 +61,7 @@ public class ReVancedUtils {
     }
 
     public static Context getContext() {
+        Context context = YouTubeTikTokRoot_Application.getAppContext();
         if (context != null) {
             return context;
         } else {
diff --git a/app/src/main/java/com/google/android/apps/youtube/app/YouTubeTikTokRoot_Application.java b/app/src/main/java/com/google/android/apps/youtube/app/YouTubeTikTokRoot_Application.java
new file mode 100644
index 00000000..8da9aba8
--- /dev/null
+++ b/app/src/main/java/com/google/android/apps/youtube/app/YouTubeTikTokRoot_Application.java
@@ -0,0 +1,10 @@
+package com.google.android.apps.youtube.app;
+
+import android.app.Application;
+import android.content.Context;
+
+public class YouTubeTikTokRoot_Application extends Application {
+    public static Context getAppContext() {
+        return null;
+    }
+}