msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Background sync, simplifications

Browse Source
pull/152/head
M66B 7 years ago
parent 4b308382c9
commit 3e86195cd8
8 changed files with 10 additions and 46 deletions
Show Stats Download Patch File Download Diff File

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

@ -293,7 +293,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
try { try {
db.beginTransaction(); db.beginTransaction();
EntityOperation.sync(context, fid); EntityOperation.sync(context, fid, true);
db.setTransactionSuccessful(); db.setTransactionSuccessful();

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

@ -87,7 +87,7 @@ public class EntityOperation {
queue(context, db, message, name, jargs); queue(context, db, message, name, jargs);
} }
static void sync(Context context, long fid) { static void sync(Context context, long fid, boolean foreground) {
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
if (db.operation().getOperationCount(fid, EntityOperation.SYNC) == 0) { if (db.operation().getOperationCount(fid, EntityOperation.SYNC) == 0) {
@ -112,10 +112,10 @@ public class EntityOperation {
if (account == null) // Outbox if (account == null) // Outbox
ServiceSend.start(context); ServiceSend.start(context);
else if (!"connected".equals(account.state)) else if (foreground && !"connected".equals(account.state))
ServiceUI.process(context, fid); ServiceUI.process(context, fid);
Log.i("Queued sync folder=" + folder); Log.i("Queued sync folder=" + folder + " foreground=" + foreground);
} }
} }

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

@ -250,7 +250,7 @@ public class FragmentFolder extends FragmentBase {
db.message().deleteMessagesBefore(id, keep_time, true); db.message().deleteMessagesBefore(id, keep_time, true);
EntityOperation.sync(context, folder.id); EntityOperation.sync(context, folder.id, true);
} }
db.setTransactionSuccessful(); db.setTransactionSuccessful();

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

@ -299,7 +299,7 @@ public class FragmentFolders extends FragmentBase {
// Unified inbox // Unified inbox
List<EntityFolder> folders = db.folder().getFoldersSynchronizingUnified(); List<EntityFolder> folders = db.folder().getFoldersSynchronizingUnified();
for (EntityFolder folder : folders) for (EntityFolder folder : folders)
EntityOperation.sync(context, folder.id); EntityOperation.sync(context, folder.id, true);
} else { } else {
// Folder list // Folder list
EntityAccount account = db.account().getAccount(aid); EntityAccount account = db.account().getAccount(aid);

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

@ -508,11 +508,11 @@ public class FragmentMessages extends FragmentBase {
if (fid < 0) { if (fid < 0) {
List<EntityFolder> folders = db.folder().getFoldersSynchronizingUnified(); List<EntityFolder> folders = db.folder().getFoldersSynchronizingUnified();
for (EntityFolder folder : folders) for (EntityFolder folder : folders)
EntityOperation.sync(context, folder.id); EntityOperation.sync(context, folder.id, true);
} else { } else {
EntityFolder folder = db.folder().getFolder(fid); EntityFolder folder = db.folder().getFolder(fid);
if (folder != null) if (folder != null)
EntityOperation.sync(context, folder.id); EntityOperation.sync(context, folder.id, true);
} }
db.setTransactionSuccessful(); db.setTransactionSuccessful();

20
app/src/main/java/eu/faircode/email/FragmentOptions.java
Unescape View File

@ -49,7 +49,6 @@ import android.widget.TimePicker;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.List;
import java.util.Objects; import java.util.Objects;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -260,25 +259,6 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
int[] values = getResources().getIntArray(R.array.downloadValues); int[] values = getResources().getIntArray(R.array.downloadValues);
prefs.edit().putInt("download", values[position]).apply(); prefs.edit().putInt("download", values[position]).apply();
Boolean metered = Helper.isMetered(getContext(), true);
if (metered != null && metered)
new SimpleTask<Void>() {
@Override
protected Void onExecute(Context context, Bundle args) {
DB db = DB.getInstance(context);
List<EntityFolder> folders = db.folder().getSynchronizingFolders();
for (EntityFolder folder : folders)
EntityOperation.sync(context, folder.id);
return null;
}
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
}
}.execute(FragmentOptions.this, new Bundle(), "download:sync");
} }
} }

16
app/src/main/java/eu/faircode/email/FragmentSetup.java
Unescape View File

@ -399,21 +399,5 @@ public class FragmentSetup extends FragmentBase {
tvPermissionsDone.setTextColor(has ? textColorPrimary : colorWarning); tvPermissionsDone.setTextColor(has ? textColorPrimary : colorWarning);
tvPermissionsDone.setCompoundDrawablesWithIntrinsicBounds(has ? check : null, null, null, null); tvPermissionsDone.setCompoundDrawablesWithIntrinsicBounds(has ? check : null, null, null, null);
btnPermissions.setEnabled(!has); btnPermissions.setEnabled(!has);
if (has && !init)
new SimpleTask<Void>() {
@Override
protected Void onExecute(Context context, Bundle args) {
DB db = DB.getInstance(context);
for (EntityFolder folder : db.folder().getSynchronizingFolders())
EntityOperation.sync(context, folder.id);
return null;
}
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
}
}.execute(FragmentSetup.this, new Bundle(), "setup:sync");
} }
} }

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

@ -581,7 +581,7 @@ public class ServiceSynchronize extends LifecycleService {
idler.start(); idler.start();
idlers.add(idler); idlers.add(idler);
EntityOperation.sync(this, folder.id); EntityOperation.sync(this, folder.id, false);
} else } else
folders.put(folder, null); folders.put(folder, null);
@ -722,7 +722,7 @@ public class ServiceSynchronize extends LifecycleService {
if (!folders.get(folder).isOpen()) if (!folders.get(folder).isOpen())
throw new FolderClosedException(folders.get(folder)); throw new FolderClosedException(folders.get(folder));
} else } else
EntityOperation.sync(this, folder.id); EntityOperation.sync(this, folder.id, false);
// Successfully connected: reset back off time // Successfully connected: reset back off time
backoff = CONNECT_BACKOFF_START; backoff = CONNECT_BACKOFF_START;

Write Preview
Loading…
Cancel
Save