mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Apply sync on launch to widgets

This commit is contained in:
M66B 2021-03-29 09:18:04 +02:00
parent 9ec584f08e
commit 77653d298b
6 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1011,7 +1011,12 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
intent.removeExtra("refresh");
setIntent(intent);
ServiceUI.sync(this, null);
int version = intent.getIntExtra("version", 0);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ActivityView.this);
boolean sync_on_launch = prefs.getBoolean("sync_on_launch", false);
if (sync_on_launch || version < 1541)
ServiceUI.sync(this, null);
}
String action = intent.getAction();

1
app/src/main/java/eu/faircode/email/ActivityWidget.java
View File

@ -163,6 +163,7 @@ public class ActivityWidget extends ActivityBase {
editor.putBoolean("widget." + appWidgetId + ".semi", cbSemiTransparent.isChecked());
editor.putInt("widget." + appWidgetId + ".background", btnColor.getColor());
editor.putInt("widget." + appWidgetId + ".layout", rbNew.isChecked() ? 1 : 0);
editor.putInt("widget." + appWidgetId + ".version", BuildConfig.VERSION_CODE);
editor.apply();
Widget.init(ActivityWidget.this, appWidgetId);

1
app/src/main/java/eu/faircode/email/ActivityWidgetSync.java
View File

@ -102,6 +102,7 @@ public class ActivityWidgetSync extends ActivityBase {
SharedPreferences.Editor editor = prefs.edit();
editor.putBoolean("widget." + appWidgetId + ".semi", cbSemiTransparent.isChecked());
editor.putInt("widget." + appWidgetId + ".background", btnColor.getColor());
editor.putInt("widget." + appWidgetId + ".version", BuildConfig.VERSION_CODE);
editor.apply();
WidgetSync.init(ActivityWidgetSync.this, appWidgetId);

1
app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java
View File

@ -155,6 +155,7 @@ public class ActivityWidgetUnified extends ActivityBase {
editor.putInt("widget." + appWidgetId + ".background", btnColor.getColor());
editor.putInt("widget." + appWidgetId + ".font", spFontSize.getSelectedItemPosition());
editor.putInt("widget." + appWidgetId + ".padding", spPadding.getSelectedItemPosition());
editor.putInt("widget." + appWidgetId + ".version", BuildConfig.VERSION_CODE);
editor.apply();

4
app/src/main/java/eu/faircode/email/Widget.java
View File

@ -60,6 +60,7 @@ public class Widget extends AppWidgetProvider {
boolean semi = prefs.getBoolean("widget." + appWidgetId + ".semi", true);
int background = prefs.getInt("widget." + appWidgetId + ".background", Color.TRANSPARENT);
int layout = prefs.getInt("widget." + appWidgetId + ".layout", 0);
int version = prefs.getInt("widget." + appWidgetId + ".version", 0);
List<EntityFolder> folders = db.folder().getNotifyingFolders(account);
if (folders == null)
@ -72,6 +73,7 @@ public class Widget extends AppWidgetProvider {
view.putExtra("account", account);
view.putExtra("type", folders.get(0).type);
view.putExtra("refresh", true);
view.putExtra("version", version);
view.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
pi = PendingIntentCompat.getActivity(
context, appWidgetId, view, PendingIntent.FLAG_UPDATE_CURRENT);
@ -80,6 +82,7 @@ public class Widget extends AppWidgetProvider {
Intent view = new Intent(context, ActivityView.class);
view.setAction("unified");
view.putExtra("refresh", true);
view.putExtra("version", version);
view.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
pi = PendingIntentCompat.getActivity(
context, ActivityView.REQUEST_UNIFIED, view, PendingIntent.FLAG_UPDATE_CURRENT);
@ -87,6 +90,7 @@ public class Widget extends AppWidgetProvider {
Intent view = new Intent(context, ActivityView.class);
view.setAction("folders:" + account);
view.putExtra("refresh", true);
view.putExtra("version", version);
view.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
pi = PendingIntentCompat.getActivity(
context, appWidgetId, view, PendingIntent.FLAG_UPDATE_CURRENT);

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

@ -48,12 +48,14 @@ public class WidgetUnified extends AppWidgetProvider {
int background = prefs.getInt("widget." + appWidgetId + ".background", Color.TRANSPARENT);
int font = prefs.getInt("widget." + appWidgetId + ".font", 0);
int padding = prefs.getInt("widget." + appWidgetId + ".padding", 0);
int version = prefs.getInt("widget." + appWidgetId + ".version", 0);
Intent view = new Intent(context, ActivityView.class);
view.setAction("folder:" + folder);
view.putExtra("account", account);
view.putExtra("type", type);
view.putExtra("refresh", true);
view.putExtra("version", version);
view.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
PendingIntent pi = PendingIntentCompat.getActivity(
context, appWidgetId, view, PendingIntent.FLAG_UPDATE_CURRENT);