Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-06 00:53:26 +02: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();

23
app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
View File

@@ -59,7 +59,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
private SwitchCompat swWatchdog;
private SwitchCompat swOptimize;
private SwitchCompat swUpdates;
private SwitchCompat swUpdatesMain;
private SwitchCompat swExperiments;
private TextView tvExperimentsHint;
private SwitchCompat swCrashReports;
@@ -75,11 +74,10 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
private TextView tvStorageSpace;
private TextView tvFingerprint;
private Group grpUpdates;
private Group grpDebug;
private final static String[] RESET_OPTIONS = new String[]{
"fts", "english", "watchdog", "auto_optimize", "updates", "updates_main", "experiments", "crash_reports", "debug"
"fts", "english", "watchdog", "auto_optimize", "updates", "experiments", "crash_reports", "debug"
};
private final static String[] RESET_QUESTIONS = new String[]{
@@ -107,7 +105,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
swWatchdog = view.findViewById(R.id.swWatchdog);
swOptimize = view.findViewById(R.id.swOptimize);
swUpdates = view.findViewById(R.id.swUpdates);
swUpdatesMain = view.findViewById(R.id.swUpdatesMain);
swExperiments = view.findViewById(R.id.swExperiments);
tvExperimentsHint = view.findViewById(R.id.tvExperimentsHint);
swCrashReports = view.findViewById(R.id.swCrashReports);
@@ -123,7 +120,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
tvStorageSpace = view.findViewById(R.id.tvStorageSpace);
tvFingerprint = view.findViewById(R.id.tvFingerprint);
grpUpdates = view.findViewById(R.id.grpUpdates);
grpDebug = view.findViewById(R.id.grpDebug);
setOptions();
@@ -211,14 +207,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
NotificationManager nm = (NotificationManager) getContext().getSystemService(Context.NOTIFICATION_SERVICE);
nm.cancel(Helper.NOTIFICATION_UPDATE);
}
swUpdatesMain.setEnabled(checked);
}
});
swUpdatesMain.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("updates_main", checked).apply();
}
});
@@ -396,8 +384,9 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
swWatchdog.setChecked(prefs.getBoolean("watchdog", true));
swOptimize.setChecked(prefs.getBoolean("auto_optimize", false));
swUpdates.setChecked(prefs.getBoolean("updates", true));
swUpdatesMain.setChecked(prefs.getBoolean("updates_main", false));
swUpdatesMain.setEnabled(swUpdates.isChecked());
swUpdates.setVisibility(
Helper.isPlayStoreInstall() || !Helper.hasValidFingerprint(getContext())
? View.GONE : View.VISIBLE);
swExperiments.setChecked(prefs.getBoolean("experiments", false));
swCrashReports.setChecked(prefs.getBoolean("crash_reports", false));
tvUuid.setText(prefs.getString("uuid", null));
@@ -414,10 +403,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
Helper.humanReadableByteCount(Helper.getTotalStorageSpace(), true)));
tvFingerprint.setText(Helper.getFingerprint(getContext()));
grpUpdates.setVisibility(!BuildConfig.DEBUG &&
(Helper.isPlayStoreInstall() || !Helper.hasValidFingerprint(getContext()))
? View.GONE : View.VISIBLE);
grpDebug.setVisibility(swDebug.isChecked() || BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
}