Refactoring

This commit is contained in:
M66B 2019-02-27 19:04:26 +00:00
parent fdd304add1
commit e970e54b6a
4 changed files with 13 additions and 7 deletions

View File

@ -356,7 +356,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
db.message().liveUnseenNotify().observe(this, new Observer<List<TupleMessageEx>>() {
@Override
public void onChanged(List<TupleMessageEx> messages) {
Core.notify(ActivityView.this, messages);
Core.notifyMessages(ActivityView.this, messages);
}
});

View File

@ -185,7 +185,7 @@ class Core {
break;
case EntityOperation.SYNC:
onSynchronizeMessages(context, account, folder, (IMAPFolder) ifolder, jargs, state);
onSynchronizeMessages(context, jargs, account, folder, (IMAPFolder) ifolder, state);
break;
default:
@ -792,7 +792,10 @@ class Core {
}
}
static void onSynchronizeMessages(Context context, EntityAccount account, final EntityFolder folder, IMAPFolder ifolder, JSONArray jargs, State state) throws JSONException, MessagingException, IOException {
static void onSynchronizeMessages(
Context context, JSONArray jargs,
EntityAccount account, final EntityFolder folder,
IMAPFolder ifolder, State state) throws JSONException, MessagingException, IOException {
final DB db = DB.getInstance(context);
try {
int sync_days = jargs.getInt(0);
@ -1389,7 +1392,7 @@ class Core {
}
}
static void notify(Context context, List<TupleMessageEx> messages) {
static void notifyMessages(Context context, List<TupleMessageEx> messages) {
Log.i("Notify messages=" + messages.size());
Widget.update(context, messages.size());
@ -1476,7 +1479,10 @@ class Core {
}
}
private static List<Notification> getNotificationUnseen(Context context, long account, String accountName, List<TupleMessageEx> messages) {
private static List<Notification> getNotificationUnseen(
Context context,
long account, String accountName,
List<TupleMessageEx> messages) {
List<Notification> notifications = new ArrayList<>();
if (messages.size() == 0)

View File

@ -127,7 +127,7 @@ public class ServiceSynchronize extends LifecycleService {
db.message().liveUnseenNotify().observe(this, new Observer<List<TupleMessageEx>>() {
@Override
public void onChanged(List<TupleMessageEx> messages) {
Core.notify(ServiceSynchronize.this, messages);
Core.notifyMessages(ServiceSynchronize.this, messages);
}
});
}

View File

@ -279,7 +279,7 @@ public class ServiceUI extends IntentService {
Core.processOperations(this, account, folder, isession, istore, ifolder, new Core.State());
// Synchronize messages
Core.onSynchronizeMessages(this, account, folder, (IMAPFolder) ifolder, folder.getSyncArgs(), new Core.State());
Core.onSynchronizeMessages(this, folder.getSyncArgs(), account, folder, (IMAPFolder) ifolder, new Core.State());
} catch (Throwable ex) {
Log.w(ex);