feat: enhance folder selection for WhatsApp integration in lite mode

Author: Dev4Mod

app/src/main/java/com/wmods/wppenhacer/preference/FileSelectPreference.java

@@ -5,10 +5,12 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
+import android.provider.Settings;
 import android.util.AttributeSet;
 import android.widget.Toast;
 
@@ -66,7 +68,7 @@ private void showAlertPermission() {
         builder.setTitle(R.string.storage_permission);
         builder.setMessage(R.string.permission_storage);
         builder.setPositiveButton(R.string.allow, (dialog, which) -> {
-            Intent intent = new Intent(android.provider.Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
+            Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.setData(Uri.fromParts("package", getContext().getPackageName(), null));
             getContext().startActivity(intent);
@@ -79,8 +81,34 @@ private void showAlertPermission() {
     public boolean onPreferenceClick(@NonNull Preference preference) {
 
         if (getSharedPreferences().getBoolean("lite_mode", false)) {
+            String packageName = "";
+            PackageInfo packageInfo = null;
+            for (var possiblePackage : new String[]{"com.whatsapp", "com.whatsapp.w4b"}) {
+                try {
+                    packageInfo = getContext().getApplicationContext().getPackageManager().getPackageInfo(possiblePackage, PackageManager.GET_ACTIVITIES);
+                    packageName = possiblePackage;
+                    break;
+                } catch (PackageManager.NameNotFoundException ignored) {
+                }
+            }
+            if (packageInfo == null) {
+                Utils.showToast("Unable to find WhatsApp package, please select the folder manually in the next screen", Toast.LENGTH_LONG);
+                return true;
+            }
+
+            String className = null;
+            for (var activity : packageInfo.activities) {
+                if (activity.name.endsWith("SettingsNotifications")) {
+                    className = activity.name;
+                    break;
+                }
+            }
+            if (className == null) {
+                Utils.showToast("Unable to find the activity to select folder, please select it manually in the next screen", Toast.LENGTH_LONG);
+                return true;
+            }
             Intent intent = new Intent();
-            intent.setClassName("com.whatsapp", ActivityController.EXPORTED_ACTIVITY);
+            intent.setClassName(packageName, className);
             intent.putExtra("key", getKey());
             intent.putExtra("download_mode", true);
             ((Activity) getContext()).startActivityForResult(intent, LiteMode.REQUEST_FOLDER);

app/src/main/java/com/wmods/wppenhacer/xposed/core/WppCore.java

@@ -60,7 +60,6 @@ public class WppCore {
     private static SQLiteDatabase mWaDatabase;
     public static BaseClient client;
     private static Object mCachedMessageStore;
-    private static Class<?> mSettingsNotificationsClass;
     private static Method convertLidToJid;
 
     private static Object mWaJidMapRepository;
@@ -86,10 +85,6 @@ public static void Initialize(ClassLoader loader, XSharedPreferences pref) throw
         convChatField = Unobfuscator.loadAntiRevokeConvChatField(loader);
         chatJidField = Unobfuscator.loadAntiRevokeChatJidField(loader);
 
-        // Settings notifications activity (required for
-        // ActivityController.EXPORTED_ACTIVITY)
-        mSettingsNotificationsClass = getSettingsNotificationsActivityClass(loader);
-
         // StartUpPrefs
         var startPrefsConfig = Unobfuscator.loadStartPrefsConfig(loader);
         XposedBridge.hookMethod(startPrefsConfig, new XC_MethodHook() {
@@ -339,17 +334,6 @@ public synchronized static Class getAboutActivityClass(@NonNull ClassLoader load
                 : XposedHelpers.findClass("com.whatsapp.settings.ui.About", loader);
     }
 
-    public synchronized static Class getSettingsNotificationsActivityClass(@NonNull ClassLoader loader) {
-        if (mSettingsNotificationsClass != null)
-            return mSettingsNotificationsClass;
-
-        Class oldClass = XposedHelpers.findClassIfExists("com.whatsapp.settings.SettingsNotifications", loader);
-
-        return oldClass != null
-                ? oldClass
-                : XposedHelpers.findClass("com.whatsapp.settings.ui.SettingsNotifications", loader);
-    }
-
     public synchronized static Class getDataUsageActivityClass(@NonNull ClassLoader loader) {
         Class oldClass = XposedHelpers.findClassIfExists("com.whatsapp.settings.SettingsDataUsageActivity", loader);
 

app/src/main/java/com/wmods/wppenhacer/xposed/features/others/ActivityController.java

@@ -20,6 +20,8 @@
 import com.wmods.wppenhacer.xposed.utils.ReflectionUtils;
 import com.wmods.wppenhacer.xposed.utils.ResId;
 
+import org.luckypray.dexkit.query.enums.StringMatchType;
+
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -31,7 +33,6 @@
 
 public class ActivityController extends Feature {
 
-    public static final String EXPORTED_ACTIVITY = WppCore.getSettingsNotificationsActivityClass(ClassLoader.getSystemClassLoader()).getName();
     private static String Key;
 
     public ActivityController(@NonNull ClassLoader classLoader, @NonNull XSharedPreferences preferences) {
@@ -41,7 +42,7 @@ public ActivityController(@NonNull ClassLoader classLoader, @NonNull XSharedPref
     @Override
     public void doHook() throws Throwable {
 
-        var clazz = XposedHelpers.findClass(EXPORTED_ACTIVITY, classLoader);
+        var clazz = Unobfuscator.findFirstClassUsingName(classLoader, StringMatchType.EndsWith,".SettingsNotifications");
         Class<?> statusDistribution = Unobfuscator.loadStatusDistributionClass(classLoader);
 
         XposedHelpers.findAndHookMethod(Activity.class, "onCreate", Bundle.class, new XC_MethodHook() {

changelog.txt

@@ -1,23 +1,17 @@
 [ADDED]
 * Added Monet colors and some others for WAE
 * Added Monet colors for WhatsApp
-* Added Call Recording feature (Voice/Video as Audio)
-* Call Recording Toast Toggle: Added option to show/hide recording toast notifications (default: off)
-* [EXPERIMENTAL] Use "Force Restore Backup" option in Chat Backup settings to restore backups after login.
-* Global Search: Added comprehensive search functionality across all app settings and features.
-* Recover deleted for me message: Added option to recover deleted for me messages.
+* Added Call Recording feature (Voice/Video as Audio) (Thanks to @mubashardev)
+* Call Recording Toast Toggle: Added option to show/hide recording toast notifications (default: off) (Thanks to @mubashardev)
+* [EXPERIMENTAL] Use "Force Restore Backup" option in Chat Backup settings to restore backups after login (Thanks to @mubashardev)
+* Global Search: Added comprehensive search functionality across all app settings and features. (Thanks to @mubashardev)
+* Recover deleted for me message: Added option to recover deleted for me messages. (Thanks to @mubashardev)
+* Added Contributors section in About page to acknowledge the efforts of contributors. (Thanks to @mubashardev)
 
 [IMPROVEMENTS]
 - Original timestamp: Added option to show original timestamp of **Delete for me** messages.
 
 [Fixed]
-* Fixed compatibility with version 2.26.6.XX
-* Fixed high-quality profile picture download
-* Fixed bug in IGStatus where dragging would case the user to switch tabs.
 * Fixed OriginFMessageField not found error
-* Fixed media quality selector
-* Fixed issue when sending high-resolution videos
-* Fixed landscape video issue
 * Fixed profile picture download for old contacts
-* Fixed bug in Update Checker
 * Optimized initial app load