Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-05 20:34:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Async widget sync state update

Browse Source
This commit is contained in:
M66B
2021-09-03 15:48:48 +02:00
parent b88ef51be8
commit 766b92438d
3 changed files with 14 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View File

@@ -658,29 +658,21 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
prefs.getBoolean(_key, false)) {
int appWidgetId = Integer.parseInt(_key.split("\\.")[1]);
String key = "widget." + appWidgetId + ".sync";
boolean sync = prefs.contains(key);
if (!sync)
continue;
long account = prefs.getLong("widget." + appWidgetId + ".account", -1L);
long folder = prefs.getLong("widget." + appWidgetId + ".folder", -1L);
if (folder > 0) {
if (!folders.contains(folder)) {
prefs.edit().remove(key).apply();
WidgetUnified.init(ServiceSynchronize.this, appWidgetId);
}
} else if (account > 0) {
if (!accounts.contains(account)) {
prefs.edit().remove(key).apply();
WidgetUnified.init(ServiceSynchronize.this, appWidgetId);
}
} else {
if (accounts.size() == 0) {
prefs.edit().remove(key).apply();
WidgetUnified.init(ServiceSynchronize.this, appWidgetId);
}
boolean state;
if (folder > 0)
state = folders.contains(folder);
else if (account > 0)
state = accounts.contains(account);
else
state = (accounts.size() > 0);
String key = "widget." + appWidgetId + ".syncing";
if (state != prefs.getBoolean(key, false)) {
prefs.edit().putBoolean(key, state).apply();
WidgetUnified.init(ServiceSynchronize.this, appWidgetId);
}
}
}

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

@@ -58,8 +58,6 @@ public class ServiceUI extends IntentService {
static final int PI_SNOOZE = 10;
static final int PI_IGNORED = 11;
private static final long WIDGET_SYNC_DURATION = 90 * 1000L;
public ServiceUI() {
this(ServiceUI.class.getName());
}
@@ -491,23 +489,6 @@ public class ServiceUI extends IntentService {
long aid = intent.getLongExtra("account", -1L);
long fid = intent.getLongExtra("folder", -1L);
onSync(aid, fid, fid < 0);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
String key = "widget." + appWidgetId + ".sync";
prefs.edit().putLong(key, new Date().getTime() + WIDGET_SYNC_DURATION).apply();
WidgetUnified.init(this, appWidgetId);
ApplicationEx.getMainHandler().postDelayed(new Runnable() {
@Override
public void run() {
try {
prefs.edit().remove(key).apply();
WidgetUnified.init(ServiceUI.this, appWidgetId);
} catch (Throwable ex) {
Log.e(ex);
}
}
}, WIDGET_SYNC_DURATION);
}
static void sync(Context context, Long account) {

5
app/src/main/java/eu/faircode/email/WidgetUnified.java
View File

@@ -105,9 +105,8 @@ public class WidgetUnified extends AppWidgetProvider {
views.setViewPadding(R.id.refresh, px, px, px, px);
views.setOnClickPendingIntent(R.id.refresh, piSync);
long now = new Date().getTime();
long refreshing = prefs.getLong("widget." + appWidgetId + ".sync", 0L);
views.setImageViewResource(R.id.refresh, refreshing < now ? R.drawable.twotone_sync_24 : R.drawable.twotone_compare_arrows_24);
boolean syncing = prefs.getBoolean("widget." + appWidgetId + ".syncing", false);
views.setImageViewResource(R.id.refresh, syncing ? R.drawable.twotone_compare_arrows_24 : R.drawable.twotone_sync_24);
views.setViewVisibility(R.id.refresh, refresh ? View.VISIBLE : View.INVISIBLE);
views.setViewVisibility(R.id.compose, compose ? View.VISIBLE : View.GONE);