TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-30 13:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add artificial delay to CheckUpdate

Browse Source
This commit is contained in:
topjohnwu 2019-02-02 01:09:53 -05:00
parent 43c0cac52f
commit bb7560e441
1 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
app-core/src/main/java/com/topjohnwu/magisk/tasks/CheckUpdates.java
View File

@ -1,45 +1,20 @@
package com.topjohnwu.magisk.tasks; package com.topjohnwu.magisk.tasks;
import android.os.SystemClock;
import com.topjohnwu.magisk.Config; import com.topjohnwu.magisk.Config;
import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Const;
import com.topjohnwu.magisk.utils.Topic; import com.topjohnwu.magisk.utils.Topic;
import com.topjohnwu.net.Networking; import com.topjohnwu.net.Networking;
import com.topjohnwu.net.Request; import com.topjohnwu.net.Request;
import com.topjohnwu.net.ResponseListener; import com.topjohnwu.net.ResponseListener;
import com.topjohnwu.superuser.internal.UiThreadHandler;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
public class CheckUpdates { public class CheckUpdates {
private static int getInt(JSONObject json, String name, int defValue) {
if (json == null)
return defValue;
try {
return json.getInt(name);
} catch (JSONException e) {
return defValue;
}
}
private static String getString(JSONObject json, String name, String defValue) {
if (json == null)
return defValue;
try {
return json.getString(name);
} catch (JSONException e) {
return defValue;
}
}
private static JSONObject getJson(JSONObject json, String name) {
try {
return json.getJSONObject(name);
} catch (JSONException e) {
return null;
}
}
private static Request getRequest() { private static Request getRequest() {
String url; String url;
switch ((int) Config.get(Config.Key.UPDATE_CHANNEL)) { switch ((int) Config.get(Config.Key.UPDATE_CHANNEL)) {
@ -70,9 +45,39 @@ public class CheckUpdates {
private static class UpdateListener implements ResponseListener<JSONObject> { private static class UpdateListener implements ResponseListener<JSONObject> {
private Runnable cb; private Runnable cb;
private long start;
UpdateListener(Runnable callback) { UpdateListener(Runnable callback) {
cb = callback; cb = callback;
start = SystemClock.uptimeMillis();
}
private int getInt(JSONObject json, String name, int defValue) {
if (json == null)
return defValue;
try {
return json.getInt(name);
} catch (JSONException e) {
return defValue;
}
}
private String getString(JSONObject json, String name, String defValue) {
if (json == null)
return defValue;
try {
return json.getString(name);
} catch (JSONException e) {
return defValue;
}
}
private JSONObject getJson(JSONObject json, String name) {
try {
return json.getJSONObject(name);
} catch (JSONException e) {
return null;
}
} }
@Override @Override
@ -93,7 +98,8 @@ public class CheckUpdates {
JSONObject uninstaller = getJson(json, "uninstaller"); JSONObject uninstaller = getJson(json, "uninstaller");
Config.uninstallerLink = getString(uninstaller, "link", null); Config.uninstallerLink = getString(uninstaller, "link", null);
Topic.publish(Topic.UPDATE_CHECK_DONE); UiThreadHandler.handler.postAtTime(() -> Topic.publish(Topic.UPDATE_CHECK_DONE),
start + 1000 /* Add artificial delay to let UI behave correctly */);
if (cb != null) if (cb != null)
cb.run(); cb.run();