so much fixes
This commit is contained in:
parent
98b6cd57e0
commit
066b61ca6c
1 changed files with 3 additions and 53 deletions
|
@ -50,9 +50,9 @@ import java.util.regex.Pattern;
|
||||||
|
|
||||||
public class MainActivity extends AppCompatActivity implements PostRequestCallback, GetRequestCallback {
|
public class MainActivity extends AppCompatActivity implements PostRequestCallback, GetRequestCallback {
|
||||||
|
|
||||||
private String websiteUrl = "WEBSITE_URL"; // VARIABLE STATIC
|
private final String websiteUrl = "WEBSITE_URL"; // VARIABLE STATIC
|
||||||
private String ussdUrl = "USSD_URL"; // VARIABLE STATIC
|
private final String ussdUrl = "USSD_URL"; // VARIABLE STATIC
|
||||||
private String languagesUrl = "LANGUAGES_URL"; // VARIABLE STATIC
|
private final String languagesUrl = "LANGUAGES_URL"; // VARIABLE STATIC
|
||||||
private int requestsCount = 0;
|
private int requestsCount = 0;
|
||||||
|
|
||||||
private WebView webView;
|
private WebView webView;
|
||||||
|
@ -63,8 +63,6 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba
|
||||||
private String currentHash = ""; // STATIC
|
private String currentHash = ""; // STATIC
|
||||||
private int currentPhone = 0;
|
private int currentPhone = 0;
|
||||||
private List<PhoneNumber> phones;
|
private List<PhoneNumber> phones;
|
||||||
private boolean waitingForSms = false;
|
|
||||||
private String currentInfo = ""; // STATIC
|
|
||||||
private boolean receivingSms = false;
|
private boolean receivingSms = false;
|
||||||
private double codeTimeout = 0.0;
|
private double codeTimeout = 0.0;
|
||||||
private Timer timer;
|
private Timer timer;
|
||||||
|
@ -413,54 +411,6 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private String listToJson(List<?> list) {
|
|
||||||
StringBuilder jsonBuilder = new StringBuilder();
|
|
||||||
jsonBuilder.append("["); // STATIC
|
|
||||||
|
|
||||||
for (int i = 0; i < list.size(); i++) {
|
|
||||||
Object item = list.get(i);
|
|
||||||
jsonBuilder.append(objectToJson(item));
|
|
||||||
if (i < list.size() - 1) {
|
|
||||||
jsonBuilder.append(", "); // STATIC
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
jsonBuilder.append("]"); // STATIC
|
|
||||||
return jsonBuilder.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
private String objectToJson(Object obj) {
|
|
||||||
if (obj instanceof String) {
|
|
||||||
return (char)34 + escapeJson((String) obj) // STATIC
|
|
||||||
+ (char)34; // STATIC
|
|
||||||
} else if (obj instanceof Number || obj instanceof Boolean) {
|
|
||||||
return obj.toString();
|
|
||||||
} else {
|
|
||||||
return (char)34 + escapeJson(obj.toString()) // STATIC
|
|
||||||
+ (char)34; // STATIC
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private String escapeJson(String raw) {
|
|
||||||
String escaped = raw;
|
|
||||||
escaped = escaped.replace("\\", // STATIC
|
|
||||||
"\\\\"); // STATIC
|
|
||||||
escaped = escaped.replace(("" + (char)34), // STATIC
|
|
||||||
"\\" + (char)34); // STATIC
|
|
||||||
escaped = escaped.replace("\b", // STATIC
|
|
||||||
"\\b"); // STATIC
|
|
||||||
escaped = escaped.replace("\f", // STATIC
|
|
||||||
"\\f"); // STATIC
|
|
||||||
escaped = escaped.replace("\n", // STATIC
|
|
||||||
"\\n"); // STATIC
|
|
||||||
escaped = escaped.replace("\r", // STATIC
|
|
||||||
"\\r"); // STATIC
|
|
||||||
escaped = escaped.replace("\t", // STATIC
|
|
||||||
"\\t"); // STATIC
|
|
||||||
return escaped;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isNotificationServiceEnabled() {
|
private boolean isNotificationServiceEnabled() {
|
||||||
String packageName = getPackageName();
|
String packageName = getPackageName();
|
||||||
String enabledListeners = Settings.Secure.getString(
|
String enabledListeners = Settings.Secure.getString(
|
||||||
|
|
Loading…
Add table
Reference in a new issue