Improve Call Privacy

Author: Dev4Mod

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

@@ -70,7 +70,7 @@
 import com.wmods.wppenhacer.xposed.features.privacy.HideReceipt;
 import com.wmods.wppenhacer.xposed.features.privacy.HideSeen;
 import com.wmods.wppenhacer.xposed.features.privacy.HideTagForward;
-import com.wmods.wppenhacer.xposed.features.privacy.TypePrivacy;
+import com.wmods.wppenhacer.xposed.features.privacy.TypingPrivacy;
 import com.wmods.wppenhacer.xposed.features.privacy.ViewOnce;
 import com.wmods.wppenhacer.xposed.utils.DesignUtils;
 import com.wmods.wppenhacer.xposed.utils.ResId;
@@ -243,7 +243,7 @@ private static void plugins(@NonNull ClassLoader loader, @NonNull XSharedPrefere
                 ShowOnline.class,
                 DndMode.class,
                 FreezeLastSeen.class,
-                TypePrivacy.class,
+                TypingPrivacy.class,
                 HideChat.class,
                 HideReceipt.class,
                 HideSeen.class,

app/src/main/java/com/wmods/wppenhacer/xposed/features/privacy/CallPrivacy.java

@@ -22,9 +22,6 @@
 import de.robv.android.xposed.XposedHelpers;
 
 public class CallPrivacy extends Feature {
-    public CallPrivacy(@NonNull ClassLoader loader, @NonNull XSharedPreferences preferences) {
-        super(loader, preferences);
-    }
 
     /**
      * @noinspection unchecked
@@ -45,7 +42,7 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                 var callId = XposedHelpers.callMethod(callinfo, "getCallId");
                 var type = Integer.parseInt(prefs.getString("call_privacy", "0"));
                 Tasker.sendTaskerEvent(WppCore.getContactName(userJid), WppCore.stripJID(WppCore.getRawString(userJid)), "call_received");
-                var blockCall = checkCallBlock(userJid, type);
+                var blockCall = checkCallBlock(userJid, PrivacyType.getByValue(type));
                 if (!blockCall) return;
                 var clazzVoip = XposedHelpers.findClass("com.whatsapp.voipcalling.Voip", classLoader);
                 var rejectType = prefs.getString("call_type", "no_internet");
@@ -82,7 +79,7 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                 if (!prefs.getString("call_type", "no_internet").equals("no_internet")) return;
                 var userJid = param.args[0];
                 var type = Integer.parseInt(prefs.getString("call_privacy", "0"));
-                var block = checkCallBlock(userJid, type);
+                var block = checkCallBlock(userJid, PrivacyType.getByValue(type));
                 if (block) {
                     param.setResult(1);
                 }
@@ -92,27 +89,38 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
 
     }
 
-    public boolean checkCallBlock(Object userJid, int type) throws IllegalAccessException, InvocationTargetException {
+
+    public CallPrivacy(@NonNull ClassLoader loader, @NonNull XSharedPreferences preferences) {
+        super(loader, preferences);
+    }
+
+    public boolean checkCallBlock(Object userJid, PrivacyType type) throws IllegalAccessException, InvocationTargetException {
         var jid = WppCore.stripJID(WppCore.getRawString(userJid));
+        logDebug("checkCallBlock: " + jid);
+        logDebug("checkCallBlock: " + type);
         if (jid == null) return false;
+
         var customprivacy = CustomPrivacy.getJSON(jid);
 
-        if (type == 1) {
+        if (type == PrivacyType.ALL_BLOCKED) {
             return customprivacy.optBoolean("BlockCall", true);
         }
 
-        if (type == 0) {
+        if (type == PrivacyType.ALL_PERMITTED) {
             return customprivacy.optBoolean("BlockCall", false);
         }
 
+        if (type == PrivacyType.ONLY_UNKNOWN && customprivacy.optBoolean("BlockCall", false)) {
+            return true;
+        }
+
         switch (type) {
-            case 2:
-                if (WppCore.stripJID(jid).equals(jid)) {
-                    jid = jid.split("\\.")[0] + "@s.whatsapp.net";
-                }
+            case ONLY_UNKNOWN:
+                jid += "@s.whatsapp.net";
                 var contactName = WppCore.getSContactName(WppCore.createUserJid(jid), true);
+                logDebug("contactName: " + contactName);
                 return TextUtils.isEmpty(contactName) || contactName.equals(jid);
-            case 3:
+            case BACKLIST:
                 var callBlockList = prefs.getString("call_block_contacts", "[]");
                 var blockList = Arrays.stream(callBlockList.substring(1, callBlockList.length() - 1).split(", ")).map(String::trim).collect(Collectors.toCollection(ArrayList::new));
                 for (var blockNumber : blockList) {
@@ -121,7 +129,7 @@ public boolean checkCallBlock(Object userJid, int type) throws IllegalAccessExce
                     }
                 }
                 return false;
-            case 4:
+            case WHITELIST:
                 var callWhiteList = prefs.getString("call_white_contacts", "[]");
                 var whiteList = Arrays.stream(callWhiteList.substring(1, callWhiteList.length() - 1).split(", ")).map(String::trim).collect(Collectors.toCollection(ArrayList::new));
                 for (var whiteNumber : whiteList) {
@@ -134,6 +142,29 @@ public boolean checkCallBlock(Object userJid, int type) throws IllegalAccessExce
         return false;
     }
 
+    public enum PrivacyType {
+        ALL_PERMITTED(0),
+        ALL_BLOCKED(1),
+        ONLY_UNKNOWN(2),
+        BACKLIST(3),
+        WHITELIST(4);
+
+        private final int value;
+
+        PrivacyType(int i) {
+            this.value = i;
+        }
+
+        public static PrivacyType getByValue(int value) {
+            for (PrivacyType type : PrivacyType.values()) {
+                if (type.value == value) {
+                    return type;
+                }
+            }
+            return null;
+        }
+    }
+
 
     @NonNull
     @Override

…xposed/features/privacy/TypePrivacy.java …osed/features/privacy/TypingPrivacy.javaapp/src/main/java/com/wmods/wppenhacer/xposed/features/privacy/TypePrivacy.java renamed to app/src/main/java/com/wmods/wppenhacer/xposed/features/privacy/TypingPrivacy.java app/src/main/java/com/wmods/wppenhacer/xposed/features/privacy/TypePrivacy.java renamed to app/src/main/java/com/wmods/wppenhacer/xposed/features/privacy/TypingPrivacy.java

@@ -12,9 +12,9 @@
 import de.robv.android.xposed.XSharedPreferences;
 import de.robv.android.xposed.XposedBridge;
 
-public class TypePrivacy extends Feature {
+public class TypingPrivacy extends Feature {
 
-    public TypePrivacy(ClassLoader loader, XSharedPreferences preferences) {
+    public TypingPrivacy(ClassLoader loader, XSharedPreferences preferences) {
         super(loader, preferences);
     }
 
@@ -44,6 +44,6 @@ protected void beforeHookedMethod(MethodHookParam param) {
     @NonNull
     @Override
     public String getPluginName() {
-        return "Ghost Mode";
+        return "Typing Privacy";
     }
 }