Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-06 12:54:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Added option to check for main updates only"

Browse Source 
This reverts commit 17dd33c6a6.
This commit is contained in:
M66B
2020-03-18 11:37:04 +01:00
parent eacea0b3a3
commit e91d4b6569
4 changed files with 10 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/eu/faircode/email/ActivityView.java
View File

@@ -724,32 +724,23 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
}
private void checkUpdate(boolean always) {
if (!BuildConfig.DEBUG &&
(Helper.isPlayStoreInstall() || !Helper.hasValidFingerprint(this)))
if (Helper.isPlayStoreInstall() || !Helper.hasValidFingerprint(this))
return;
long now = new Date().getTime();
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
boolean updates = prefs.getBoolean("updates", true);
boolean updates_main = prefs.getBoolean("updates_main", false);
long last_update_check = prefs.getLong("last_update_check", 0);
if (!always && !updates)
if (!always && !prefs.getBoolean("updates", true))
return;
if (!always && last_update_check + UPDATE_INTERVAL > now)
if (!always && prefs.getLong("last_update_check", 0) + UPDATE_INTERVAL > now)
return;
prefs.edit().putLong("last_update_check", now).apply();
Bundle args = new Bundle();
args.putBoolean("always", always);
args.putBoolean("updates_main", updates_main);
new SimpleTask<UpdateInfo>() {
@Override
protected UpdateInfo onExecute(Context context, Bundle args) throws Throwable {
boolean updates_main = args.getBoolean("updates_main");
StringBuilder response = new StringBuilder();
HttpsURLConnection urlConnection = null;
try {
@@ -783,8 +774,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
JSONObject jroot = new JSONObject(response.toString());
if (!jroot.has("name") || jroot.isNull("name"))
throw new IOException("name field missing");
if (!jroot.has("tag_name") || jroot.isNull("tag_name"))
throw new IOException("tag_name field missing");
if (!jroot.has("html_url") || jroot.isNull("html_url"))
@@ -792,10 +781,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
if (!jroot.has("assets") || jroot.isNull("assets"))
throw new IOException("assets section missing");
String name = jroot.getString("name");
if (updates_main && !name.contains("*"))
return null;
// Get update info
UpdateInfo info = new UpdateInfo();
info.tag_name = jroot.getString("tag_name");
@@ -806,8 +791,8 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
for (int i = 0; i < jassets.length(); i++) {
JSONObject jasset = jassets.getJSONObject(i);
if (jasset.has("name") && !jasset.isNull("name")) {
String filename = jasset.getString("name");
if (filename.endsWith(".apk")) {
String name = jasset.getString("name");
if (name.endsWith(".apk")) {
Log.i("Latest version=" + info.tag_name);
if (BuildConfig.VERSION_NAME.equals(info.tag_name))
return null;
@@ -827,7 +812,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
@Override
protected void onExecuted(Bundle args, UpdateInfo info) {
boolean always = args.getBoolean("always");
if (info == null) {
if (always)
ToastEx.makeText(ActivityView.this, BuildConfig.VERSION_NAME, Toast.LENGTH_LONG).show();