Skip to content

Commit f3a4106

Browse files
committed
Bug fixes
1 parent 1791be1 commit f3a4106

File tree

2 files changed

+7
-19
lines changed

2 files changed

+7
-19
lines changed

cdph_updatechecker_app/src/main/java/com/cdph/updatechecker/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ protected void onCreate(Bundle savedInstanceState)
1818
setContentView(R.layout.main);
1919

2020
UpdateChecker.getInstance(this)
21-
.setUpdateLogsUrl("https://pastebin.com/raw/SFpLs0De")
21+
.setUpdateLogsUrl("https://pastebin.com/raw/e3q1h4iQ")
2222
.shouldAutoRun(true)
2323
.shouldAutoInstall(true)
2424
.setJsonReader(new MyCustomJsonReader())

cdph_updatechecker_lib/src/main/java/com/cdph/app/UpdateChecker.java

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ private static class TaskUpdateChecker extends AsyncTask<String, Void, NewUpdate
222222
private static final int READ_TIMEOUT = 3000;
223223

224224
private ProgressDialog dlg;
225+
private String errMsg;
225226

226227
@Override
227228
protected void onPreExecute()
@@ -246,7 +247,7 @@ protected NewUpdateInfo doInBackground(String... params)
246247
NewUpdateInfo info = null;
247248

248249
try {
249-
String str_url = sanitizeUrl(params[0]);
250+
String str_url = params[0];
250251
URL url = new URL(str_url);
251252

252253
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -274,6 +275,7 @@ protected NewUpdateInfo doInBackground(String... params)
274275
conn.disconnect();
275276
} catch(Exception e) {
276277
e.printStackTrace();
278+
errMsg += e.getMessage();
277279
}
278280

279281
return info;
@@ -288,30 +290,16 @@ protected void onPostExecute(NewUpdateInfo result)
288290
if(dlg != null)
289291
dlg.dismiss();
290292

291-
if(listener != null)
293+
if(listener != null && errMsg == null)
292294
if(ctx.getPackageManager().getPackageInfo(ctx.getPackageName(), 0).versionCode < result.app_version)
293295
listener.onUpdateDetected(result, autoInstall);
296+
else
297+
Toast.makeText(ctx, errMsg, Toast.LENGTH_LONG).show();
294298
} catch(Exception e) {
295299
e.printStackTrace();
296300
Toast.makeText(ctx, e.getMessage(), Toast.LENGTH_LONG).show();
297301
}
298302
}
299-
300-
private String sanitizeUrl(String url)
301-
{
302-
String sanitized = url;
303-
304-
if(url.contains("//"))
305-
{
306-
String[] params = url.split("//");
307-
if(!params[0].equals("http:") || !params[0].equals("https:"))
308-
sanitized = "https://" + url;
309-
}
310-
else
311-
sanitized = "https://" + url;
312-
313-
return sanitized;
314-
}
315303
}
316304

317305
private static final class TaskDownloadUpdate extends AsyncTask<String, Void, File>

0 commit comments

Comments
 (0)