|
@ -370,7 +370,7 @@ public class ServiceSynchronize extends LifecycleService { |
|
|
else |
|
|
else |
|
|
action = account + "/" + folder; |
|
|
action = account + "/" + folder; |
|
|
|
|
|
|
|
|
EntityLog.log(this, action + "\n" + ex.toString() + "\n" + Log.getStackTraceString(ex)); |
|
|
|
|
|
|
|
|
EntityLog.log(this, action + " " + Helper.formatThrowable(ex)); |
|
|
|
|
|
|
|
|
if (ex instanceof SendFailedException) { |
|
|
if (ex instanceof SendFailedException) { |
|
|
NotificationManager nm = getSystemService(NotificationManager.class); |
|
|
NotificationManager nm = getSystemService(NotificationManager.class); |
|
@ -1695,10 +1695,10 @@ public class ServiceSynchronize extends LifecycleService { |
|
|
boolean joined = false; |
|
|
boolean joined = false; |
|
|
while (!joined) |
|
|
while (!joined) |
|
|
try { |
|
|
try { |
|
|
EntityLog.log(this, "Joining " + thread.getName()); |
|
|
|
|
|
|
|
|
Log.i(Helper.TAG, "Joining " + thread.getName()); |
|
|
thread.join(); |
|
|
thread.join(); |
|
|
joined = true; |
|
|
joined = true; |
|
|
EntityLog.log(this, "Joined " + thread.getName()); |
|
|
|
|
|
|
|
|
Log.i(Helper.TAG, "Joined " + thread.getName()); |
|
|
} catch (InterruptedException ex) { |
|
|
} catch (InterruptedException ex) { |
|
|
Log.w(Helper.TAG, thread.getName() + " join " + ex.toString()); |
|
|
Log.w(Helper.TAG, thread.getName() + " join " + ex.toString()); |
|
|
} |
|
|
} |
|
|