Skip to content

Commit df815b7

Browse files
Dev4ModDev4Mod
committed
Refactor: Rename Jid/Lid to PhoneJid/UserJid for clarity
1 parent e729b63 commit df815b7

23 files changed

+93
-99
lines changed

‎app/src/main/java/com/wmods/wppenhacer/adapter/IGStatusAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public View getView(int position, @Nullable View convertView, @NonNull ViewGroup
134134
try {
135135
var clazz = Unobfuscator.getClassByName("StatusPlaybackActivity", getContext().getClassLoader());
136136
var intent = new Intent(WppCore.getCurrentActivity(), clazz);
137-
intent.putExtra("jid", holder.userJid.getRawString());
137+
intent.putExtra("jid", holder.userJid.getPhoneRawString());
138138
WppCore.getCurrentActivity().startActivity(intent);
139139
} catch (Exception e) {
140140
Utils.showToast(e.getMessage(), 1);
@@ -177,7 +177,7 @@ public void setInfo(Object item) {
177177
this.userJid = new FMessageWpp.UserJid(ReflectionUtils.getObjectField(field, statusInfo));
178178
var contactName = WppCore.getContactName(this.userJid);
179179
igStatusContactName.setText(contactName);
180-
var profile = WppCore.getContactPhotoDrawable(this.userJid.getRawString());
180+
var profile = WppCore.getContactPhotoDrawable(this.userJid.getPhoneRawString());
181181
if (profile == null) profile = DesignUtils.getDrawableByName("avatar_contact");
182182
igStatusContactPhoto.setImageDrawable(profile);
183183
var countUnseen = XposedHelpers.getIntField(statusInfo, "A01");

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
133133

134134
}
135135

136-
public static Object convertLidToJid(Object lid) {
136+
public static Object getPhoneJidFromUserJid(Object lid) {
137137
if (lid == null) return null;
138138
try {
139139
var rawString = (String) XposedHelpers.callMethod(lid, "getRawString");
@@ -146,7 +146,7 @@ public static Object convertLidToJid(Object lid) {
146146
return lid;
147147
}
148148

149-
public static Object convertJidToLid(Object userJid) {
149+
public static Object getUserJidFromPhoneJid(Object userJid) {
150150
if (userJid == null) return null;
151151
try {
152152
var rawString = (String) XposedHelpers.callMethod(userJid, "getRawString");
@@ -371,7 +371,7 @@ public static String getSContactName(FMessageWpp.UserJid userJid, boolean saveOn
371371
selection = "jid = ?";
372372
}
373373
String name = null;
374-
var rawJid = userJid.getRawString();
374+
var rawJid = userJid.getPhoneRawString();
375375
var cursor = mWaDatabase.query("wa_contacts", new String[]{"display_name"}, selection, new String[]{rawJid}, null, null, null);
376376
if (cursor.moveToFirst()) {
377377
name = cursor.getString(0);
@@ -385,7 +385,7 @@ public static String getWppContactName(FMessageWpp.UserJid userJid) {
385385
loadWADatabase();
386386
if (mWaDatabase == null || userJid.isNull()) return "";
387387
String name = null;
388-
var rawJid = userJid.getRawString();
388+
var rawJid = userJid.getPhoneRawString();
389389
var cursor2 = mWaDatabase.query("wa_vnames", new String[]{"verified_name"}, "jid = ?", new String[]{rawJid}, null, null, null);
390390
if (cursor2.moveToFirst()) {
391391
name = cursor2.getString(0);

‎app/src/main/java/com/wmods/wppenhacer/xposed/core/components/FMessageWpp.java‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -239,51 +239,51 @@ public Key(Object key) {
239239

240240
public static class UserJid {
241241

242-
public Object jid;
242+
public Object phoneJid;
243243

244-
public Object lid;
244+
public Object userJid;
245245

246246
public UserJid(@Nullable String rawjid) {
247247
if (rawjid == null) return;
248248
if (checkValidLID(rawjid)) {
249-
this.lid = WppCore.createUserJid(rawjid);
250-
this.jid = WppCore.convertLidToJid(this.lid);
249+
this.userJid = WppCore.createUserJid(rawjid);
250+
this.phoneJid = WppCore.getPhoneJidFromUserJid(this.userJid);
251251
} else {
252-
this.jid = WppCore.createUserJid(rawjid);
253-
this.lid = WppCore.convertJidToLid(this.jid);
252+
this.phoneJid = WppCore.createUserJid(rawjid);
253+
this.userJid = WppCore.getUserJidFromPhoneJid(this.phoneJid);
254254
}
255255
}
256256

257257
public UserJid(@Nullable Object lidOrJid) {
258258
if (lidOrJid == null) return;
259259
if (checkValidLID((String) XposedHelpers.callMethod(lidOrJid, "getRawString"))) {
260-
this.lid = lidOrJid;
261-
this.jid = WppCore.convertLidToJid(this.lid);
260+
this.userJid = lidOrJid;
261+
this.phoneJid = WppCore.getPhoneJidFromUserJid(this.userJid);
262262
} else {
263-
this.jid = lidOrJid;
264-
this.lid = WppCore.convertJidToLid(this.jid);
263+
this.phoneJid = lidOrJid;
264+
this.userJid = WppCore.getUserJidFromPhoneJid(this.phoneJid);
265265
}
266266
}
267267

268268
@Nullable
269-
public String getRawString() {
270-
if (this.jid == null) return null;
271-
String raw = (String) XposedHelpers.callMethod(this.jid, "getRawString");
269+
public String getPhoneRawString() {
270+
if (this.phoneJid == null) return null;
271+
String raw = (String) XposedHelpers.callMethod(this.phoneJid, "getRawString");
272272
if (raw == null) return null;
273273
return raw.replaceFirst("\\.[\\d:]+@", "@");
274274
}
275275

276276
@Nullable
277-
public String getRawLidString() {
278-
if (this.jid == null) return null;
279-
String raw = (String) XposedHelpers.callMethod(this.lid, "getRawString");
277+
public String getUserRawString() {
278+
if (this.phoneJid == null) return null;
279+
String raw = (String) XposedHelpers.callMethod(this.userJid, "getRawString");
280280
if (raw == null) return null;
281281
return raw.replaceFirst("\\.[\\d:]+@", "@");
282282
}
283283

284284
@Nullable
285-
public String getStripJID() {
286-
var str = getRawString();
285+
public String getPhoneNumber() {
286+
var str = getPhoneRawString();
287287
try {
288288
if (str == null) return null;
289289
if (str.contains(".") && str.contains("@") && str.indexOf(".") < str.indexOf("@")) {
@@ -299,26 +299,26 @@ public String getStripJID() {
299299
}
300300

301301
public boolean isStatus() {
302-
return Objects.equals(getStripJID(), "status");
302+
return Objects.equals(getPhoneNumber(), "status");
303303
}
304304

305305
public boolean isNewsletter() {
306-
String raw = getRawString();
306+
String raw = getPhoneRawString();
307307
if (raw == null) return false;
308308
return raw.contains("@newsletter");
309309
}
310310

311311

312312
public boolean isGroup() {
313-
if (this.jid == null) return false;
314-
String str = getRawString();
313+
if (this.phoneJid == null) return false;
314+
String str = getPhoneRawString();
315315
if (str == null) return false;
316316
return str.contains("-") || str.contains("@g.us") || (!str.contains("@") && str.length() > 16);
317317
}
318318

319319

320320
public boolean isNull() {
321-
return this.jid == null && this.lid == null;
321+
return this.phoneJid == null && this.userJid == null;
322322
}
323323

324324
private static boolean checkValidLID(String lid) {
@@ -333,8 +333,8 @@ private static boolean checkValidLID(String lid) {
333333
@Override
334334
public String toString() {
335335
return "UserJid{" +
336-
"jid=" + jid +
337-
", lid=" + lid +
336+
"PhoneJid=" + phoneJid +
337+
", UserJid=" + userJid +
338338
'}';
339339
}
340340
}

‎app/src/main/java/com/wmods/wppenhacer/xposed/core/db/MessageHistory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ public static class MessageSeenItem {
242242
public FMessageWpp getFMessage() {
243243
if (fMessageWpp == null) {
244244
try {
245-
var userJid = WppCore.convertJidToLid(WppCore.createUserJid(jid));
245+
var userJid = WppCore.getUserJidFromPhoneJid(WppCore.createUserJid(jid));
246246
if (userJid == null) return null;
247247
var key = XposedHelpers.newInstance(FMessageWpp.Key.TYPE, userJid, message, false);
248248
var fmessageObj = WppCore.getFMessageFromKey(key);

‎app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2031,7 +2031,7 @@ public static Method loadAddMenuAndroidX(ClassLoader classLoader) throws Excepti
20312031
}
20322032

20332033
public static Method loadConvertLidToJid(ClassLoader loader) throws Exception {
2034-
return UnobfuscatorCache.getInstance().getMethod(loader, () -> findFirstMethodUsingStrings(loader, StringMatchType.Contains, "WaJidMapRepository/getJidByExistingAccountUserJidNoCreate"));
2034+
return UnobfuscatorCache.getInstance().getMethod(loader, () -> findFirstMethodUsingStrings(loader, StringMatchType.Contains, "WaJidMapRepository/getPhoneJidByAccountUserJid"));
20352035
}
20362036

20372037
public static Method loadConvertJidToLid(ClassLoader loader) throws Exception {

‎app/src/main/java/com/wmods/wppenhacer/xposed/features/customization/HideSeenView.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import com.wmods.wppenhacer.xposed.core.WppCore;
1818
import com.wmods.wppenhacer.xposed.core.components.FMessageWpp;
1919
import com.wmods.wppenhacer.xposed.core.db.MessageHistory;
20-
import com.wmods.wppenhacer.xposed.utils.ReflectionUtils;
2120
import com.wmods.wppenhacer.xposed.utils.Utils;
2221

2322
import de.robv.android.xposed.XC_MethodHook;
@@ -80,7 +79,7 @@ private static void updateBubbleView(FMessageWpp fmessage, View viewGroup) {
8079
var messageId = fmessage.getKey().messageID;
8180
ImageView view = viewGroup.findViewById(Utils.getID("view_once_control_icon", "id"));
8281
if (view != null) {
83-
var messageOnce = MessageHistory.getInstance().getHideSeenMessage(userJid.getRawString(), messageId, MessageHistory.MessageType.VIEW_ONCE_TYPE);
82+
var messageOnce = MessageHistory.getInstance().getHideSeenMessage(userJid.getPhoneRawString(), messageId, MessageHistory.MessageType.VIEW_ONCE_TYPE);
8483
if (messageOnce != null) {
8584
view.setColorFilter(messageOnce.viewed ? Color.GREEN : Color.RED);
8685
} else {
@@ -96,7 +95,7 @@ private static void updateBubbleView(FMessageWpp fmessage, View viewGroup) {
9695
status.setTextSize(8);
9796
dateWrapper.addView(status);
9897
}
99-
var message = MessageHistory.getInstance().getHideSeenMessage(userJid.getRawString(), messageId, MessageHistory.MessageType.MESSAGE_TYPE);
98+
var message = MessageHistory.getInstance().getHideSeenMessage(userJid.getPhoneRawString(), messageId, MessageHistory.MessageType.MESSAGE_TYPE);
10099
if (message != null) {
101100
status.setVisibility(View.VISIBLE);
102101
status.setText(message.viewed ? "\uD83D\uDFE2" : "\uD83D\uDD34");

‎app/src/main/java/com/wmods/wppenhacer/xposed/features/customization/ShowOnline.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import androidx.core.text.TextUtilsCompat;
1717

1818
import com.wmods.wppenhacer.xposed.core.Feature;
19-
import com.wmods.wppenhacer.xposed.core.WppCore;
2019
import com.wmods.wppenhacer.xposed.core.components.FMessageWpp;
2120
import com.wmods.wppenhacer.xposed.core.devkit.Unobfuscator;
2221
import com.wmods.wppenhacer.xposed.core.devkit.UnobfuscatorCache;
@@ -179,7 +178,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
179178
var tokenDBInstance = fieldTokenDBInstance.get(mInstancePresence);
180179
var tokenData = ReflectionUtils.callMethod(tcTokenMethod, tokenDBInstance, jidObject);
181180
var tokenObj = tokenClass.getConstructors()[0].newInstance(tokenData == null ? null : XposedHelpers.getObjectField(tokenData, "A01"));
182-
sendPresenceMethod.invoke(null, userJid.lid, null, tokenObj, mInstancePresence);
181+
sendPresenceMethod.invoke(null, userJid.userJid, null, tokenObj, mInstancePresence);
183182

184183
var status = (String) ReflectionUtils.callMethod(getStatusUser, mStatusUser, object, false);
185184
var currentPosition = (int) ReflectionUtils.callMethod(getAdapterPositionMethod, viewHolder);

‎app/src/main/java/com/wmods/wppenhacer/xposed/features/general/AntiRevoke.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,14 @@ public String getPluginName() {
135135

136136
private static void saveRevokedMessage(FMessageWpp fMessage) {
137137
var messageKey = (String) XposedHelpers.getObjectField(fMessage.getObject(), "A01");
138-
var stripJID = fMessage.getKey().remoteJid.getStripJID();
138+
var stripJID = fMessage.getKey().remoteJid.getPhoneNumber();
139139
HashSet<String> messages = getRevokedMessages(fMessage);
140140
messages.add(messageKey);
141141
DelMessageStore.getInstance(Utils.getApplication()).insertMessage(stripJID, messageKey, System.currentTimeMillis());
142142
}
143143

144144
private static HashSet<String> getRevokedMessages(FMessageWpp fMessage) {
145-
String stripJID = fMessage.getKey().remoteJid.getStripJID();
145+
String stripJID = fMessage.getKey().remoteJid.getPhoneNumber();
146146
if (messageRevokedMap.containsKey(stripJID)) {
147147
return messageRevokedMap.get(stripJID);
148148
}
@@ -196,7 +196,7 @@ private void isMRevoked(Object objMessage, TextView dateTextView, String antirev
196196
private int antiRevoke(FMessageWpp fMessage) {
197197
showToast(fMessage);
198198
String messageKey = (String) XposedHelpers.getObjectField(fMessage.getObject(), "A01");
199-
String stripJID = fMessage.getKey().remoteJid.getStripJID();
199+
String stripJID = fMessage.getKey().remoteJid.getPhoneNumber();
200200
int revokeboolean = stripJID.equals("status") ? Integer.parseInt(prefs.getString("antirevokestatus", "0")) : Integer.parseInt(prefs.getString("antirevoke", "0"));
201201
if (revokeboolean == 0) return revokeboolean;
202202
var messageRevokedList = getRevokedMessages(fMessage);
@@ -206,7 +206,7 @@ private int antiRevoke(FMessageWpp fMessage) {
206206
saveRevokedMessage(fMessage);
207207
try {
208208
var mConversation = WppCore.getCurrentConversation();
209-
if (mConversation != null && Objects.equals(stripJID, WppCore.getCurrentUserJid().getStripJID())) {
209+
if (mConversation != null && Objects.equals(stripJID, WppCore.getCurrentUserJid().getPhoneNumber())) {
210210
mConversation.runOnUiThread(() -> {
211211
if (mConversation.hasWindowFocus()) {
212212
mConversation.startActivity(mConversation.getIntent());
@@ -235,17 +235,17 @@ private void showToast(FMessageWpp fMessage) {
235235
messageSuffix = Utils.getApplication().getString(ResId.string.deleted_status);
236236
jidAuthor = new FMessageWpp.UserJid(fMessage.getUserJid());
237237
}
238-
if (jidAuthor.lid == null) return;
238+
if (jidAuthor.userJid == null) return;
239239
String name = WppCore.getContactName(jidAuthor);
240240
if (TextUtils.isEmpty(name)) {
241-
name = jidAuthor.getStripJID();
241+
name = jidAuthor.getPhoneNumber();
242242
}
243243
String message;
244244
if (jidAuthor.isGroup() && fMessage.getUserJid().isNull()) {
245245
var participantJid = fMessage.getUserJid();
246246
String participantName = WppCore.getContactName(participantJid);
247247
if (TextUtils.isEmpty(participantName)) {
248-
participantName = participantJid.getStripJID();
248+
participantName = participantJid.getPhoneNumber();
249249
}
250250
message = Utils.getApplication().getString(ResId.string.deleted_a_message_in_group, participantName, name);
251251
} else {
@@ -254,7 +254,7 @@ private void showToast(FMessageWpp fMessage) {
254254
if (prefs.getBoolean("toastdeleted", false)) {
255255
Utils.showToast(message, Toast.LENGTH_LONG);
256256
}
257-
Tasker.sendTaskerEvent(name, jidAuthor.getStripJID(), jidAuthor.isStatus() ? "deleted_status" : "deleted_message");
257+
Tasker.sendTaskerEvent(name, jidAuthor.getPhoneNumber(), jidAuthor.isStatus() ? "deleted_status" : "deleted_message");
258258
}
259259

260260
}

‎app/src/main/java/com/wmods/wppenhacer/xposed/features/general/CallType.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import androidx.annotation.NonNull;
1010

1111
import com.wmods.wppenhacer.xposed.core.Feature;
12-
import com.wmods.wppenhacer.xposed.core.WppCore;
1312
import com.wmods.wppenhacer.xposed.core.components.AlertDialogWpp;
1413
import com.wmods.wppenhacer.xposed.core.components.FMessageWpp;
1514
import com.wmods.wppenhacer.xposed.core.devkit.Unobfuscator;
@@ -90,7 +89,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
9089
var intent = new Intent();
9190
intent.setAction(Intent.ACTION_DIAL);
9291
var userJid = new FMessageWpp.UserJid(jid);
93-
intent.setData(Uri.parse("tel:+" + userJid.getStripJID()));
92+
intent.setData(Uri.parse("tel:+" + userJid.getPhoneNumber()));
9493
context.startActivity(intent);
9594
break;
9695
case 1:

‎app/src/main/java/com/wmods/wppenhacer/xposed/features/general/DeleteStatus.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public String getPluginName() {
7171
@NonNull
7272
private static Bundle getBundle(FMessageWpp.Key key) {
7373
var bundle = new Bundle();
74-
bundle.putString("fMessageKeyJid", key.remoteJid.getRawLidString());
74+
bundle.putString("fMessageKeyJid", key.remoteJid.getUserRawString());
7575
bundle.putBoolean("fMessageKeyFromMe", key.isFromMe);
7676
bundle.putString("fMessageKeyId", key.messageID);
7777
return bundle;

0 commit comments

Comments
 (0)