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

Refactoring, simplifications

Browse Source
pull/30/head
M66B 7 years ago
parent 617f83587c
commit 55b10420cf
1 changed files with 50 additions and 59 deletions
Show Stats Download Patch File Download Diff File

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

@ -96,7 +96,6 @@ import androidx.lifecycle.Observer;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
public class ServiceSynchronize extends LifecycleService { public class ServiceSynchronize extends LifecycleService {
private ServiceState state = new ServiceState();
private ExecutorService executor = Executors.newSingleThreadExecutor(); private ExecutorService executor = Executors.newSingleThreadExecutor();
private static final int NOTIFICATION_SYNCHRONIZE = 1; private static final int NOTIFICATION_SYNCHRONIZE = 1;
@ -109,11 +108,6 @@ public class ServiceSynchronize extends LifecycleService {
static final String ACTION_PROCESS_FOLDER = BuildConfig.APPLICATION_ID + ".PROCESS_FOLDER"; static final String ACTION_PROCESS_FOLDER = BuildConfig.APPLICATION_ID + ".PROCESS_FOLDER";
static final String ACTION_PROCESS_OUTBOX = BuildConfig.APPLICATION_ID + ".PROCESS_OUTBOX"; static final String ACTION_PROCESS_OUTBOX = BuildConfig.APPLICATION_ID + ".PROCESS_OUTBOX";
private class ServiceState {
boolean running = false;
List<Thread> threads = new ArrayList<>(); // accounts
}
public ServiceSynchronize() { public ServiceSynchronize() {
// https://docs.oracle.com/javaee/6/api/javax/mail/internet/package-summary.html // https://docs.oracle.com/javaee/6/api/javax/mail/internet/package-summary.html
System.setProperty("mail.mime.ignoreunknownencoding", "true"); System.setProperty("mail.mime.ignoreunknownencoding", "true");
@ -301,7 +295,7 @@ public class ServiceSynchronize extends LifecycleService {
} }
} }
private void monitorAccount(final EntityAccount account) { private void monitorAccount(final EntityAccount account, final ServiceState state) {
Log.i(Helper.TAG, account.name + " start "); Log.i(Helper.TAG, account.name + " start ");
while (state.running) { while (state.running) {
@ -377,7 +371,7 @@ public class ServiceSynchronize extends LifecycleService {
mapFolder.put(folder.id, ifolder); mapFolder.put(folder.id, ifolder);
} }
monitorFolder(account, folder, fstore, ifolder); monitorFolder(account, folder, fstore, ifolder, state);
} catch (FolderNotFoundException ex) { } catch (FolderNotFoundException ex) {
Log.w(Helper.TAG, folder.name + " " + ex + "\n" + Log.getStackTraceString(ex)); Log.w(Helper.TAG, folder.name + " " + ex + "\n" + Log.getStackTraceString(ex));
} catch (Throwable ex) { } catch (Throwable ex) {
@ -567,7 +561,10 @@ public class ServiceSynchronize extends LifecycleService {
Log.i(Helper.TAG, account.name + " stopped"); Log.i(Helper.TAG, account.name + " stopped");
} }
private void monitorFolder(final EntityAccount account, final EntityFolder folder, final IMAPStore istore, final IMAPFolder ifolder) throws MessagingException, JSONException, IOException { private void monitorFolder(
final EntityAccount account, final EntityFolder folder,
final IMAPStore istore, final IMAPFolder ifolder,
ServiceState state) throws MessagingException, JSONException, IOException {
// Listen for new and deleted messages // Listen for new and deleted messages
ifolder.addMessageCountListener(new MessageCountAdapter() { ifolder.addMessageCountListener(new MessageCountAdapter() {
@Override @Override
@ -1245,7 +1242,7 @@ public class ServiceSynchronize extends LifecycleService {
} }
ConnectivityManager.NetworkCallback networkCallback = new ConnectivityManager.NetworkCallback() { ConnectivityManager.NetworkCallback networkCallback = new ConnectivityManager.NetworkCallback() {
private Thread mainThread; final ServiceState state = new ServiceState();
private EntityFolder outbox = null; private EntityFolder outbox = null;
@Override @Override
@ -1253,11 +1250,10 @@ public class ServiceSynchronize extends LifecycleService {
Log.i(Helper.TAG, "Available " + network); Log.i(Helper.TAG, "Available " + network);
synchronized (state) { synchronized (state) {
if (!state.running) {
state.threads.clear();
state.running = true; state.running = true;
}
mainThread = new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
DB db = DB.getInstance(ServiceSynchronize.this); DB db = DB.getInstance(ServiceSynchronize.this);
@ -1269,19 +1265,17 @@ public class ServiceSynchronize extends LifecycleService {
} else } else
for (final EntityAccount account : accounts) { for (final EntityAccount account : accounts) {
Log.i(Helper.TAG, account.host + "/" + account.user + " run"); Log.i(Helper.TAG, account.host + "/" + account.user + " run");
Thread thread = new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
try { try {
monitorAccount(account); monitorAccount(account, state);
} catch (Throwable ex) { } catch (Throwable ex) {
// Fallsafe // Fallsafe
Log.e(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex)); Log.e(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
} }
} }
}, "sync.account." + account.id); }, "sync.account." + account.id).start();
state.threads.add(thread);
thread.start();
} }
} catch (Throwable ex) { } catch (Throwable ex) {
// Failsafe // Failsafe
@ -1297,10 +1291,7 @@ public class ServiceSynchronize extends LifecycleService {
} }
} }
}, "sync.main"); }, "sync.main").start();
mainThread.start();
}
}
} }
@Override @Override
@ -1308,11 +1299,9 @@ public class ServiceSynchronize extends LifecycleService {
Log.i(Helper.TAG, "Lost " + network); Log.i(Helper.TAG, "Lost " + network);
synchronized (state) { synchronized (state) {
if (state.running) {
state.running = false; state.running = false;
state.notifyAll(); state.notifyAll();
} }
}
if (outbox != null) { if (outbox != null) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(ServiceSynchronize.this); LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(ServiceSynchronize.this);
@ -1330,9 +1319,7 @@ public class ServiceSynchronize extends LifecycleService {
public void run() { public void run() {
try { try {
Log.i(Helper.TAG, outbox.name + " start operations"); Log.i(Helper.TAG, outbox.name + " start operations");
synchronized (outbox) {
processOperations(outbox, null, null); processOperations(outbox, null, null);
}
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(Helper.TAG, outbox.name + " " + ex + "\n" + Log.getStackTraceString(ex)); Log.e(Helper.TAG, outbox.name + " " + ex + "\n" + Log.getStackTraceString(ex));
reportError(null, outbox.name, ex); reportError(null, outbox.name, ex);
@ -1382,4 +1369,8 @@ public class ServiceSynchronize extends LifecycleService {
context.stopService(new Intent(context, ServiceSynchronize.class)); context.stopService(new Intent(context, ServiceSynchronize.class));
start(context); start(context);
} }
private class ServiceState {
boolean running = false;
}
} }

Write Preview
Loading…
Cancel
Save