app/src/main/java/name/mikanoshi/customiuizer/mods/System.java

@@ -83,7 +83,6 @@ import android.text.format.DateUtils;
 import android.util.ArrayMap;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.util.Pair;
 import android.util.SparseIntArray;
 import android.util.TypedValue;
@@ -140,20 +139,12 @@ import java.util.TimerTask;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 
-import static java.lang.System.currentTimeMillis;
-import static java.lang.System.nanoTime;
-
-import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam;
 import de.robv.android.xposed.XC_MethodHook.MethodHookParam;
 import de.robv.android.xposed.XC_MethodReplacement;
 import de.robv.android.xposed.XposedBridge;
 import de.robv.android.xposed.XposedHelpers;
-import static de.robv.android.xposed.XposedHelpers.findClass;
-import static de.robv.android.xposed.XposedHelpers.findClassIfExists;
-import static de.robv.android.xposed.XposedHelpers.findMethodExactIfExists;
-
+import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam;
 import miui.os.SystemProperties;
-
 import name.mikanoshi.customiuizer.MainModule;
 import name.mikanoshi.customiuizer.R;
 import name.mikanoshi.customiuizer.utils.AudioVisualizer;
@@ -162,6 +153,12 @@ import name.mikanoshi.customiuizer.utils.Helpers;
 import name.mikanoshi.customiuizer.utils.Helpers.MethodHook;
 import name.mikanoshi.customiuizer.utils.Helpers.MimeType;
 
+import static de.robv.android.xposed.XposedHelpers.findClass;
+import static de.robv.android.xposed.XposedHelpers.findClassIfExists;
+import static de.robv.android.xposed.XposedHelpers.findMethodExactIfExists;
+import static java.lang.System.currentTimeMillis;
+import static java.lang.System.nanoTime;
+
 public class System {
 
 	public static void ScreenAnimHook(LoadPackageParam lpparam) {
@@ -746,6 +743,18 @@ public class System {
 				modifyIconLabelToast(param);
 			}
 		});
+
+		//noinspection ResultOfMethodCallIgnored
+		Helpers.findAndHookMethodSilently("android.widget.ToastInjector", null, "addAppName", Context.class, CharSequence.class, new MethodHook() {
+			@Override
+			protected void before(MethodHookParam param) throws Throwable {
+				Context ctx = (Context) param.args[0];
+				int option = Integer.parseInt(Helpers.getSharedStringPref(ctx, "pref_key_system_iconlabletoasts", "1"));
+				if (option != 1) {
+					param.setResult(param.args[1]);
+				}
+			}
+		});
 	}
 
 	public static void DoubleTapToSleepHook(LoadPackageParam lpparam) {