1515import com .wmods .wppenhacer .xposed .core .Utils ;
1616import com .wmods .wppenhacer .xposed .core .WppCore ;
1717
18+ import java .util .Objects ;
19+
1820import de .robv .android .xposed .XC_MethodHook ;
1921import de .robv .android .xposed .XSharedPreferences ;
2022import de .robv .android .xposed .XposedBridge ;
@@ -55,19 +57,6 @@ public static void sendTaskerEvent(String number, String event) {
5557 Utils .getApplication ().sendBroadcast (intent );
5658 }
5759
58- public static class SenderMessageBroadcastReceiver extends BroadcastReceiver {
59-
60- @ Override
61- public void onReceive (Context context , Intent intent ) {
62- XposedBridge .log ("Message sent" );
63- var number = intent .getStringExtra ("number" );
64- var message = intent .getStringExtra ("message" );
65- if (number == null || message == null ) return ;
66- number = number .replaceAll ("\\ D" , "" );
67- WppCore .sendMessage (number , message );
68- }
69- }
70-
7160 public void hookReceiveMessage () throws Throwable {
7261 var method = Unobfuscator .loadReceiptMethod (classLoader );
7362 var method2 = Unobfuscator .loadReceiptOutsideChat (classLoader );
@@ -88,12 +77,14 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
8877 var messageKey = fieldMessageKey .get (fMessage );
8978 var userJid = XposedHelpers .getObjectField (messageKey , "A00" );
9079 var rawJid = WppCore .getRawString (userJid );
80+ var name = WppCore .getContactName (userJid );
9181 var number = WppCore .stripJID (rawJid );
9282 var msg = (String ) newMessageMethod .invoke (fMessage );
9383 if (TextUtils .isEmpty (msg ) || TextUtils .isEmpty (number )) return ;
9484 new Handler (Utils .getApplication ().getMainLooper ()).post (() -> {
9585 Intent intent = new Intent ("com.wmods.wppenhacer.MESSAGE_RECEIVED" );
9686 intent .putExtra ("number" , number );
87+ intent .putExtra ("name" , name );
9788 intent .putExtra ("message" , msg );
9889 Utils .getApplication ().sendBroadcast (intent );
9990 });
@@ -102,4 +93,21 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
10293
10394 }
10495
96+ public static class SenderMessageBroadcastReceiver extends BroadcastReceiver {
97+
98+ @ Override
99+ public void onReceive (Context context , Intent intent ) {
100+ XposedBridge .log ("Message sent" );
101+ var number = intent .getStringExtra ("number" );
102+ if (number == null ) {
103+ number = String .valueOf (intent .getLongExtra ("number" , 0 ));
104+ number = Objects .equals (number , "0" ) ? null : number ;
105+ }
106+ var message = intent .getStringExtra ("message" );
107+ if (number == null || message == null ) return ;
108+ number = number .replaceAll ("\\ D" , "" );
109+ WppCore .sendMessage (number , message );
110+ }
111+ }
112+
105113}
0 commit comments