Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-29 05:15:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Restore banner timer

Browse Source
This commit is contained in:
M66B
2020-03-19 16:20:47 +01:00
parent 012bb8703a
commit ca6740776c
4 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@@ -3132,11 +3132,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
if ("pro".equals(key) || "banner".equals(key)) {
if ("pro".equals(key) || "banner_hidden".equals(key)) {
boolean pro = ActivityBilling.isPro(getContext());
boolean banner = prefs.getBoolean("banner", true);
long banner_hidden = prefs.getLong("banner_hidden", 0);
grpSupport.setVisibility(
!pro && banner && viewType == AdapterMessage.ViewType.UNIFIED
!pro && banner_hidden == 0 && viewType == AdapterMessage.ViewType.UNIFIED
? View.VISIBLE : View.GONE);
}
}

11
app/src/main/java/eu/faircode/email/FragmentPro.java
View File

@@ -78,13 +78,12 @@ public class FragmentPro extends FragmentBase implements SharedPreferences.OnSha
tvInfo.setText(getString(R.string.title_pro_info)
.replaceAll("^\\s+", "").replaceAll("\\s+", " "));
boolean banner = prefs.getBoolean("banner", true);
cbHide.setChecked(!banner);
long banner_hidden = prefs.getLong("banner_hidden", 0);
cbHide.setChecked(banner_hidden > 0);
cbHide.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
prefs.edit().putBoolean("banner", !isChecked).apply();
ServiceUI.scheduleBanner(getContext(), isChecked);
}
});
@@ -204,7 +203,9 @@ public class FragmentPro extends FragmentBase implements SharedPreferences.OnSha
boolean pro = ActivityBilling.isPro(getContext());
tvActivated.setVisibility(pro ? View.VISIBLE : View.GONE);
cbHide.setVisibility(pro ? View.GONE : View.VISIBLE);
} else if ("banner".equals(key))
cbHide.setChecked(!prefs.getBoolean(key, true));
} else if ("banner_hidden".equals(key)) {
long banner_hidden = prefs.getLong("banner_hidden", 0);
cbHide.setChecked(banner_hidden > 0);
}
}
}

7
app/src/main/java/eu/faircode/email/ReceiverAutoStart.java
View File

@@ -22,9 +22,6 @@ package eu.faircode.email;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import androidx.preference.PreferenceManager;
public class ReceiverAutoStart extends BroadcastReceiver {
@Override
@@ -33,11 +30,9 @@ public class ReceiverAutoStart extends BroadcastReceiver {
Intent.ACTION_MY_PACKAGE_REPLACED.equals(intent.getAction())) {
Log.i("Received " + intent);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
prefs.edit().remove("banner").apply();
ServiceSynchronize.boot(context);
ServiceSend.boot(context);
ServiceUI.boot(context);
WorkerCleanup.queueOnce(context);
}
}

25
app/src/main/java/eu/faircode/email/ServiceUI.java
View File

@@ -475,7 +475,7 @@ public class ServiceUI extends IntentService {
private void onBanner() {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
prefs.edit().remove("banner").apply();
prefs.edit().remove("banner_hidden").apply();
}
static void sync(Context context, Long account) {
@@ -506,22 +506,37 @@ public class ServiceUI extends IntentService {
}
}
static void scheduleBanner(Context context, boolean set) {
private static PendingIntent getBannerIntent(Context context) {
Intent banner = new Intent(context, ServiceUI.class);
banner.setAction("banner");
PendingIntent pi = PendingIntent.getService(context, ServiceUI.PI_BANNER, banner, PendingIntent.FLAG_UPDATE_CURRENT);
return PendingIntent.getService(context, ServiceUI.PI_BANNER, banner, PendingIntent.FLAG_UPDATE_CURRENT);
}
static void scheduleBanner(Context context, boolean set) {
AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
if (set) {
long now = new Date().getTime();
long interval = AlarmManager.INTERVAL_DAY * 7;
long due = interval - (now % interval);
long trigger = now + due;
Log.i("Set banner alarm at " + new Date(trigger) + " due=" + due);
am.set(AlarmManager.RTC, trigger, pi);
am.set(AlarmManager.RTC, trigger, getBannerIntent(context));
prefs.edit().putLong("banner_hidden", trigger).apply();
} else {
Log.i("Cancel banner alarm");
am.cancel(pi);
am.cancel(getBannerIntent(context));
prefs.edit().remove("banner_hidden").apply();
}
}
static void boot(Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
long banner_hidden = prefs.getLong("banner_hidden", 0);
if (banner_hidden > 0) {
Log.i("Restore banner alarm at " + new Date(banner_hidden));
AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
am.set(AlarmManager.RTC, banner_hidden, getBannerIntent(context));
}
}
}