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

Added on demand process

Browse Source
pull/152/head
M66B 7 years ago
parent 9d15ccc695
commit c39b85c139
11 changed files with 115 additions and 52 deletions
Show Stats Download Patch File Download Diff File

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

@ -306,7 +306,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
// Outbox // Outbox
if (internet) { if (internet) {
now = true; now = true;
EntityOperation.sync(context, db, fid); EntityOperation.sync(context, fid);
} else } else
throw new IllegalArgumentException(context.getString(R.string.title_no_internet)); throw new IllegalArgumentException(context.getString(R.string.title_no_internet));
} else { } else {
@ -314,12 +314,12 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
if (account.ondemand || !enabled) { if (account.ondemand || !enabled) {
if (internet) { if (internet) {
now = true; now = true;
ServiceUI.sync(context, fid); EntityOperation.sync(context, fid);
} else } else
throw new IllegalArgumentException(context.getString(R.string.title_no_internet)); throw new IllegalArgumentException(context.getString(R.string.title_no_internet));
} else { } else {
now = "connected".equals(account.state); now = "connected".equals(account.state);
EntityOperation.sync(context, db, fid); EntityOperation.sync(context, fid);
} }
} }

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

@ -39,13 +39,6 @@ public interface DaoFolder {
" AND (account.synchronize AND NOT account.ondemand)") " AND (account.synchronize AND NOT account.ondemand)")
List<EntityFolder> getFoldersAutoSync(); List<EntityFolder> getFoldersAutoSync();
@Query("SELECT folder.* FROM folder" +
" JOIN account ON account.id = folder.account" +
" WHERE folder.synchronize" +
" AND account.id = :account" +
" AND (account.synchronize AND account.ondemand)")
List<EntityFolder> getFoldersOnDemandSync(long account);
@Query("SELECT folder.* FROM folder" + @Query("SELECT folder.* FROM folder" +
" JOIN account ON account.id = folder.account" + " JOIN account ON account.id = folder.account" +
" WHERE account.synchronize" + " WHERE account.synchronize" +

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

@ -98,10 +98,14 @@ public class EntityOperation {
queue(context, db, message, name, jargs); queue(context, db, message, name, jargs);
} }
static void sync(Context context, DB db, long fid) { static void sync(Context context, long fid) {
DB db = DB.getInstance(context);
if (db.operation().getOperationCount(fid, EntityOperation.SYNC) == 0) { if (db.operation().getOperationCount(fid, EntityOperation.SYNC) == 0) {
EntityFolder folder = db.folder().getFolder(fid); EntityFolder folder = db.folder().getFolder(fid);
EntityAccount account = null;
if (folder.account != null)
account = db.account().getAccount(folder.account);
EntityOperation operation = new EntityOperation(); EntityOperation operation = new EntityOperation();
operation.folder = folder.id; operation.folder = folder.id;
@ -111,10 +115,16 @@ public class EntityOperation {
operation.created = new Date().getTime(); operation.created = new Date().getTime();
operation.id = db.operation().insertOperation(operation); operation.id = db.operation().insertOperation(operation);
db.folder().setFolderSyncState(fid, "requested"); if (account != null && account.ondemand) {
db.folder().setFolderState(fid, "waiting");
db.folder().setFolderSyncState(fid, "manual");
} else
db.folder().setFolderSyncState(fid, "requested");
if (folder.account == null) // Outbox if (account == null) // Outbox
ServiceSend.start(context); ServiceSend.start(context);
else if (account.ondemand)
ServiceUI.process(context, fid);
Log.i("Queued sync folder=" + folder); Log.i("Queued sync folder=" + folder);
} }
@ -225,8 +235,6 @@ public class EntityOperation {
} else if (DELETE.equals(name)) } else if (DELETE.equals(name))
db.message().setMessageUiHide(message.id, true); db.message().setMessageUiHide(message.id, true);
else if (SEND.equals(name))
ServiceSend.start(context);
} catch (JSONException ex) { } catch (JSONException ex) {
Log.e(ex); Log.e(ex);
} }
@ -242,6 +250,14 @@ public class EntityOperation {
Log.i("Queued op=" + operation.id + "/" + operation.name + Log.i("Queued op=" + operation.id + "/" + operation.name +
" msg=" + operation.folder + "/" + operation.message + " msg=" + operation.folder + "/" + operation.message +
" args=" + operation.args); " args=" + operation.args);
if (SEND.equals(name))
ServiceSend.start(context);
else {
EntityAccount account = db.account().getAccount(message.account);
if (account.ondemand)
ServiceUI.process(context, operation.folder);
}
} }
@Override @Override

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, db, folder.id); EntityOperation.sync(context, folder.id);
} }
db.setTransactionSuccessful(); db.setTransactionSuccessful();

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

@ -310,12 +310,12 @@ public class FragmentFolders extends FragmentBase {
if (account.ondemand || !enabled) if (account.ondemand || !enabled)
if (internet) { if (internet) {
now = true; now = true;
ServiceUI.sync(context, folder.id); EntityOperation.sync(context, folder.id);
} else } else
nointernet = true; nointernet = true;
else { else {
now = "connected".equals(account.state); now = "connected".equals(account.state);
EntityOperation.sync(context, db, folder.id); EntityOperation.sync(context, folder.id);
} }
} }
} else { } else {
@ -323,9 +323,7 @@ public class FragmentFolders extends FragmentBase {
if (account.ondemand || !enabled) { if (account.ondemand || !enabled) {
if (internet) { if (internet) {
now = true; now = true;
List<EntityFolder> folders = db.folder().getFoldersOnDemandSync(aid); ServiceUI.fsync(context, aid);
for (EntityFolder folder : folders)
ServiceUI.sync(context, folder.id);
} else } else
nointernet = true; nointernet = true;
} else { } else {

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

@ -521,7 +521,7 @@ public class FragmentMessages extends FragmentBase {
// Outbox // Outbox
if (internet) { if (internet) {
now = true; now = true;
EntityOperation.sync(context, db, folder.id); EntityOperation.sync(context, folder.id);
} else } else
nointernet = true; nointernet = true;
} else { } else {
@ -529,12 +529,12 @@ public class FragmentMessages extends FragmentBase {
if (account.ondemand || !enabled) { if (account.ondemand || !enabled) {
if (internet) { if (internet) {
now = true; now = true;
ServiceUI.sync(context, folder.id); EntityOperation.sync(context, folder.id);
} else } else
nointernet = true; nointernet = true;
} else { } else {
now = "connected".equals(account.state); now = "connected".equals(account.state);
EntityOperation.sync(context, db, folder.id); EntityOperation.sync(context, folder.id);
} }
} }

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

@ -269,7 +269,7 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
List<EntityFolder> folders = db.folder().getFoldersAutoSync(); List<EntityFolder> folders = db.folder().getFoldersAutoSync();
for (EntityFolder folder : folders) for (EntityFolder folder : folders)
EntityOperation.sync(context, db, folder.id); EntityOperation.sync(context, folder.id);
return null; return null;
} }

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

@ -406,7 +406,7 @@ public class FragmentSetup extends FragmentBase {
protected Void onExecute(Context context, Bundle args) { protected Void onExecute(Context context, Bundle args) {
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
for (EntityFolder folder : db.folder().getFoldersAutoSync()) for (EntityFolder folder : db.folder().getFoldersAutoSync())
EntityOperation.sync(context, db, folder.id); EntityOperation.sync(context, folder.id);
return null; return null;
} }

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

@ -235,9 +235,9 @@ public class ServiceSynchronize extends LifecycleService {
Log.i(account.name + " run"); Log.i(account.name + " run");
// Debug // Debug
boolean debug = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("debug", false); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ServiceSynchronize.this);
debug = debug || BuildConfig.DEBUG; boolean debug = (prefs.getBoolean("debug", false) || BuildConfig.BETA_RELEASE);
System.setProperty("mail.socket.debug", Boolean.toString(debug)); //System.setProperty("mail.socket.debug", Boolean.toString(debug));
// Create session // Create session
Properties props = MessageHelper.getSessionProperties(account.auth_type, account.realm, account.insecure); Properties props = MessageHelper.getSessionProperties(account.auth_type, account.realm, account.insecure);
@ -581,7 +581,7 @@ public class ServiceSynchronize extends LifecycleService {
idler.start(); idler.start();
idlers.add(idler); idlers.add(idler);
EntityOperation.sync(this, db, folder.id); EntityOperation.sync(this, folder.id);
} 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, db, folder.id); EntityOperation.sync(this, folder.id);
// Successfully connected: reset back off time // Successfully connected: reset back off time
backoff = CONNECT_BACKOFF_START; backoff = CONNECT_BACKOFF_START;

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

@ -9,8 +9,6 @@ import android.net.Uri;
import android.os.PowerManager; import android.os.PowerManager;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import com.sun.mail.imap.IMAPFolder;
import java.util.Date; import java.util.Date;
import java.util.Properties; import java.util.Properties;
@ -101,12 +99,16 @@ public class ServiceUI extends IntentService {
break; break;
case "snooze": case "snooze":
// AlarmManager.RTC_WAKEUP
onSnooze(id); onSnooze(id);
break; break;
case "synchronize": case "process":
// AlarmManager.RTC_WAKEUP onProcessOperation(id);
onSyncOndemand(id); break;
case "fsync":
onFolderSync(id);
break; break;
default: default:
@ -239,10 +241,9 @@ public class ServiceUI extends IntentService {
} }
} }
private void onSyncOndemand(long fid) { private void onProcessOperation(long fid) {
Log.i("Synchronize on demand folder=" + fid);
DB db = DB.getInstance(this); DB db = DB.getInstance(this);
EntityFolder folder = db.folder().getFolder(fid); EntityFolder folder = db.folder().getFolder(fid);
if (folder == null) if (folder == null)
return; return;
@ -252,10 +253,13 @@ public class ServiceUI extends IntentService {
Store istore = null; Store istore = null;
try { try {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
boolean debug = (prefs.getBoolean("debug", false) || BuildConfig.BETA_RELEASE);
// Create session // Create session
Properties props = MessageHelper.getSessionProperties(account.auth_type, account.realm, account.insecure); Properties props = MessageHelper.getSessionProperties(account.auth_type, account.realm, account.insecure);
final Session isession = Session.getInstance(props, null); final Session isession = Session.getInstance(props, null);
isession.setDebug(true); isession.setDebug(debug);
// Connect account // Connect account
Log.i(account.name + " connecting"); Log.i(account.name + " connecting");
@ -267,9 +271,6 @@ public class ServiceUI extends IntentService {
db.account().setAccountError(account.id, null); db.account().setAccountError(account.id, null);
Log.i(account.name + " connected"); Log.i(account.name + " connected");
// Synchronize folders
Core.onSynchronizeFolders(this, account, istore, new Core.State());
// Connect folder // Connect folder
Log.i(folder.name + " connecting"); Log.i(folder.name + " connecting");
db.folder().setFolderState(folder.id, "connecting"); db.folder().setFolderState(folder.id, "connecting");
@ -282,9 +283,6 @@ public class ServiceUI extends IntentService {
// Process operations // Process operations
Core.processOperations(this, account, folder, isession, istore, ifolder, new Core.State()); Core.processOperations(this, account, folder, isession, istore, ifolder, new Core.State());
// Synchronize messages
Core.onSynchronizeMessages(this, folder.getSyncArgs(), account, folder, (IMAPFolder) ifolder, new Core.State());
} catch (Throwable ex) { } catch (Throwable ex) {
Log.w(ex); Log.w(ex);
Core.reportError(this, account, folder, ex); Core.reportError(this, account, folder, ex);
@ -311,13 +309,66 @@ public class ServiceUI extends IntentService {
} }
} }
public static void sync(Context context, long folder) { private void onFolderSync(long aid) {
DB db = DB.getInstance(context); DB db = DB.getInstance(this);
db.folder().setFolderState(folder, "waiting"); EntityAccount account = db.account().getAccount(aid);
db.folder().setFolderSyncState(folder, "manual"); if (account == null)
return;
Store istore = null;
try {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
boolean debug = (prefs.getBoolean("debug", false) || BuildConfig.BETA_RELEASE);
// Create session
Properties props = MessageHelper.getSessionProperties(account.auth_type, account.realm, account.insecure);
final Session isession = Session.getInstance(props, null);
isession.setDebug(debug);
// Connect account
Log.i(account.name + " connecting");
db.account().setAccountState(account.id, "connecting");
istore = isession.getStore(account.getProtocol());
Helper.connect(this, istore, account);
db.account().setAccountState(account.id, "connected");
db.account().setAccountConnected(account.id, new Date().getTime());
db.account().setAccountError(account.id, null);
Log.i(account.name + " connected");
// Synchronize folders
Core.onSynchronizeFolders(this, account, istore, new Core.State());
} catch (Throwable ex) {
Log.w(ex);
Core.reportError(this, account, null, ex);
db.account().setAccountError(account.id, Helper.formatThrowable(ex));
} finally {
if (istore != null) {
Log.i(account.name + " closing");
db.account().setAccountState(account.id, "closing");
try {
istore.close();
} catch (MessagingException ex) {
Log.e(ex);
}
Log.i(account.name + " closed");
}
db.account().setAccountState(account.id, null);
}
}
public static void process(Context context, long folder) {
context.startService(
new Intent(context, ServiceUI.class)
.setAction("process:" + folder));
}
public static void fsync(Context context, long account) {
context.startService( context.startService(
new Intent(context, ServiceUI.class) new Intent(context, ServiceUI.class)
.setAction("synchronize:" + folder)); .setAction("fsync:" + account));
} }
} }

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

@ -20,8 +20,10 @@ package eu.faircode.email;
*/ */
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.preference.PreferenceManager;
import com.sun.mail.iap.Argument; import com.sun.mail.iap.Argument;
import com.sun.mail.iap.Response; import com.sun.mail.iap.Response;
@ -163,9 +165,12 @@ public class ViewModelBrowse extends ViewModel {
if (!internet) if (!internet)
throw new IllegalArgumentException(state.context.getString(R.string.title_no_internet)); throw new IllegalArgumentException(state.context.getString(R.string.title_no_internet));
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(state.context);
boolean debug = (prefs.getBoolean("debug", false) || BuildConfig.BETA_RELEASE);
Properties props = MessageHelper.getSessionProperties(account.auth_type, account.realm, account.insecure); Properties props = MessageHelper.getSessionProperties(account.auth_type, account.realm, account.insecure);
Session isession = Session.getInstance(props, null); Session isession = Session.getInstance(props, null);
isession.setDebug(true); isession.setDebug(debug);
Log.i("Boundary connecting account=" + account.name); Log.i("Boundary connecting account=" + account.name);
state.istore = (IMAPStore) isession.getStore(account.getProtocol()); state.istore = (IMAPStore) isession.getStore(account.getProtocol());

Write Preview
Loading…
Cancel
Save