Browse Source

Added restart app button for no config case

hbw_build
Wong Joon Hui 2 years ago
parent
commit
9ae90dc0ce
  1. 2
      app/src/main/java/com/cst/im30/MainApplication.java
  2. 1
      app/src/main/java/com/cst/im30/activity/MainActivity.java
  3. 19
      app/src/main/java/com/cst/im30/utility/SetupUtils.java

2
app/src/main/java/com/cst/im30/MainApplication.java

@ -186,7 +186,7 @@ public class MainApplication extends Application {
}
@SuppressLint("UnspecifiedImmutableFlag")
private void restartApp() {
public void restartApp() {
Intent intent = new Intent(getApplicationContext(), MainActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
PendingIntent pendingIntent = PendingIntent.getActivity(MainApplication.getInstance().getApplicationContext(), 0, intent, PendingIntent.FLAG_CANCEL_CURRENT);

1
app/src/main/java/com/cst/im30/activity/MainActivity.java

@ -269,6 +269,7 @@ public class MainActivity extends AppCompatActivity implements CallableInterface
TextView setupText = findViewById(R.id.setupText);
setupText.setText(text);
setupText.setVisibility(View.VISIBLE);
setupText.setOnClickListener(v -> MainApplication.getInstance().restartApp());
}

19
app/src/main/java/com/cst/im30/utility/SetupUtils.java

@ -78,6 +78,8 @@ public class SetupUtils {
e.printStackTrace();
return false;
}
} else {
return false;
}
if (json.has("current")) {
@ -87,6 +89,8 @@ public class SetupUtils {
e.printStackTrace();
return false;
}
} else {
return false;
}
LinkedHashMap<String, String> infoMap = new LinkedHashMap<>();
@ -112,25 +116,12 @@ public class SetupUtils {
public void getConfig() {
Logger.logD("START");
String serialNumber = DeviceUtils.getSerialNumber();
//String serialNumber = "1640011627";
RetrofitAPICollection service = RetrofitClient.getRetrofitClient(BuildConfig.CONFIG_URL).create(RetrofitAPICollection.class);
Call<String> call = service.getConfig(serialNumber, BuildConfig.AUTH_KEY, serialNumber);
Logger.logAPI(serialNumber);
/*call.enqueue(new Callback<String>() {
@Override
public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
onResponseGetConfig(response);
}
@Override
public void onFailure(@NonNull Call<String> call, @NonNull Throwable t) {
assert true;
//onFailureGetConfig(t);
}
});*/
try {
Response<String> response = call.execute();
onResponseGetConfig(response);

Loading…
Cancel
Save