Refactoring

pull/146/head
M66B 7 years ago
parent a1e25e3348
commit b783224f71

@ -128,7 +128,7 @@ import static android.os.Process.THREAD_PRIORITY_BACKGROUND;
public class ServiceSynchronize extends LifecycleService { public class ServiceSynchronize extends LifecycleService {
private TupleAccountStats lastStats = null; private TupleAccountStats lastStats = null;
private ServiceManager serviceManager = new ServiceManager(); private ServiceManager serviceManager = new ServiceManager();
private static ExecutorService executor = Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory); private ExecutorService executor = Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory);
private static final int NOTIFICATION_SYNCHRONIZE = 1; private static final int NOTIFICATION_SYNCHRONIZE = 1;
@ -274,7 +274,9 @@ public class ServiceSynchronize extends LifecycleService {
super.onStartCommand(intent, flags, startId); super.onStartCommand(intent, flags, startId);
if (action != null) { if (action != null) {
if ("why".equals(action)) { final String[] parts = action.split(":");
switch (parts[0]) {
case "why":
Intent why = new Intent(Intent.ACTION_VIEW); Intent why = new Intent(Intent.ACTION_VIEW);
why.setData(Uri.parse("https://github.com/M66B/open-source-email/blob/master/FAQ.md#user-content-faq2")); why.setData(Uri.parse("https://github.com/M66B/open-source-email/blob/master/FAQ.md#user-content-faq2"));
why.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); why.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@ -289,47 +291,48 @@ public class ServiceSynchronize extends LifecycleService {
prefs.edit().putBoolean("why", true).apply(); prefs.edit().putBoolean("why", true).apply();
startActivity(why); startActivity(why);
} }
break;
} else if ("init".equals(action)) { case "init":
// Network events will manage the service // Network events will manage the service
serviceManager.service_init(); serviceManager.service_init();
break;
} else if ("reload".equals(action)) { case "reload":
serviceManager.queue_reload(true, intent.getStringExtra("reason")); serviceManager.queue_reload(true, intent.getStringExtra("reason"));
break;
} else if ("clear".equals(action)) { case "clear":
new SimpleTask<Void>() { executor.submit(new Runnable() {
@Override @Override
protected Void onLoad(Context context, Bundle args) { public void run() {
DB.getInstance(context).message().ignoreAll(); DB.getInstance(ServiceSynchronize.this).message().ignoreAll();
return null;
} }
}.load(this, new Bundle()); });
break;
} else if (action.startsWith("seen:") ||
action.startsWith("archive:") ||
action.startsWith("trash:") ||
action.startsWith("ignored:")) {
Bundle args = new Bundle();
args.putLong("id", Long.parseLong(action.split(":")[1]));
args.putString("action", action.split(":")[0]);
new SimpleTask<Void>() { case "seen":
case "archive":
case "trash":
case "ignore":
executor.submit(new Runnable() {
@Override @Override
protected Void onLoad(Context context, Bundle args) { public void run() {
long id = args.getLong("id"); long id = Long.parseLong(parts[1]);
String action = args.getString("action");
DB db = DB.getInstance(context); DB db = DB.getInstance(ServiceSynchronize.this);
try { try {
db.beginTransaction(); db.beginTransaction();
EntityMessage message = db.message().getMessage(id); EntityMessage message = db.message().getMessage(id);
if ("seen".equals(action)) { switch (parts[0]) {
case "seen":
db.message().setMessageUiSeen(message.id, true); db.message().setMessageUiSeen(message.id, true);
db.message().setMessageUiIgnored(message.id, true); db.message().setMessageUiIgnored(message.id, true);
EntityOperation.queue(db, message, EntityOperation.SEEN, true); EntityOperation.queue(db, message, EntityOperation.SEEN, true);
} else if ("archive".equals(action)) { break;
case "archive":
EntityFolder archive = db.folder().getFolderByType(message.account, EntityFolder.ARCHIVE); EntityFolder archive = db.folder().getFolderByType(message.account, EntityFolder.ARCHIVE);
if (archive == null) if (archive == null)
archive = db.folder().getFolderByType(message.account, EntityFolder.TRASH); archive = db.folder().getFolderByType(message.account, EntityFolder.TRASH);
@ -338,24 +341,35 @@ public class ServiceSynchronize extends LifecycleService {
EntityOperation.queue(db, message, EntityOperation.MOVE, archive.id); EntityOperation.queue(db, message, EntityOperation.MOVE, archive.id);
db.message().setMessageUiHide(message.id, true); db.message().setMessageUiHide(message.id, true);
} }
} else if ("trash".equals(action)) { break;
case "trash":
EntityFolder trash = db.folder().getFolderByType(message.account, EntityFolder.TRASH); EntityFolder trash = db.folder().getFolderByType(message.account, EntityFolder.TRASH);
if (trash != null) { if (trash != null) {
EntityOperation.queue(db, message, EntityOperation.SEEN, true); EntityOperation.queue(db, message, EntityOperation.SEEN, true);
EntityOperation.queue(db, message, EntityOperation.MOVE, trash.id); EntityOperation.queue(db, message, EntityOperation.MOVE, trash.id);
db.message().setMessageUiHide(message.id, true); db.message().setMessageUiHide(message.id, true);
} }
} else if ("ignored".equals(action)) break;
case "ignore":
db.message().setMessageUiIgnored(message.id, true); db.message().setMessageUiIgnored(message.id, true);
break;
default:
Log.w(Helper.TAG, "Unknown action: " + parts[0]);
}
db.setTransactionSuccessful(); db.setTransactionSuccessful();
} finally { } finally {
db.endTransaction(); db.endTransaction();
} }
return null;
} }
}.load(this, args); });
break;
default:
Log.w(Helper.TAG, "Unknown action: " + action);
} }
} }
@ -520,7 +534,7 @@ public class ServiceSynchronize extends LifecycleService {
this, ActivityView.REQUEST_THREAD, thread, PendingIntent.FLAG_UPDATE_CURRENT); this, ActivityView.REQUEST_THREAD, thread, PendingIntent.FLAG_UPDATE_CURRENT);
Intent ignored = new Intent(this, ServiceSynchronize.class); Intent ignored = new Intent(this, ServiceSynchronize.class);
ignored.setAction("ignored:" + message.id); ignored.setAction("ignore:" + message.id);
PendingIntent piDelete = PendingIntent.getService(this, PI_IGNORED, ignored, PendingIntent.FLAG_UPDATE_CURRENT); PendingIntent piDelete = PendingIntent.getService(this, PI_IGNORED, ignored, PendingIntent.FLAG_UPDATE_CURRENT);
Intent seen = new Intent(this, ServiceSynchronize.class); Intent seen = new Intent(this, ServiceSynchronize.class);

Loading…
Cancel
Save