mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

On foreground while in car or in call

This commit is contained in:
M66B 2023-01-11 09:19:42 +01:00
parent a5a830f3b1
commit bba4e62b8c
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
private boolean isInCar = false;
private boolean isOptimizing = false;
private boolean foreground = false;
private MutableLiveData<Boolean> foreground = new MutableLiveData<>();
private final Map<Long, Core.State> coreStates = new Hashtable<>();
private final MutableLiveData<ConnectionHelper.NetworkState> liveNetworkState = new MutableLiveData<>();
private final MutableLiveData<List<TupleAccountState>> liveAccountState = new MutableLiveData<>();
@ -815,6 +815,18 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
}
});
foreground.observe(this, new Observer<Boolean>() {
@Override
public void onChanged(Boolean foreground) {
Log.i("Observed foreground=" + foreground);
boolean fg = Boolean.TRUE.equals(foreground);
if (!fg && (isInCall || isInCar))
mowner.stop();
else
mowner.start();
}
});
MediaPlayerHelper.liveInCall(this, this, new MediaPlayerHelper.IInCall() {
@Override
public void onChanged(boolean inCall) {
@ -822,7 +834,8 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
EntityLog.log(ServiceSynchronize.this, EntityLog.Type.Debug,
"In call=" + inCall + " suppress=" + suppress);
isInCall = (inCall && suppress);
if (isInCall || isInCar)
boolean fg = Boolean.TRUE.equals(foreground.getValue());
if (!fg && (isInCall || isInCar))
mowner.stop();
else
mowner.start();
@ -838,7 +851,8 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
EntityLog.log(ServiceSynchronize.this, EntityLog.Type.Debug,
"Projection=" + projection + " state=" + connectionState + " suppress=" + suppress);
isInCar = (projection && suppress);
if (isInCall || isInCar)
boolean fg = Boolean.TRUE.equals(foreground.getValue());
if (!fg && (isInCall || isInCar))
mowner.stop();
else
mowner.start();
@ -852,7 +866,8 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
@Override
public void delegate() {
try {
Core.notifyMessages(ServiceSynchronize.this, messages, notificationData, foreground);
boolean fg = Boolean.TRUE.equals(foreground.getValue());
Core.notifyMessages(ServiceSynchronize.this, messages, notificationData, fg);
} catch (SecurityException ex) {
Log.w(ex);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ServiceSynchronize.this);
@ -1329,9 +1344,10 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
}
private void onState(Intent intent) {
foreground = intent.getBooleanExtra("foreground", false);
boolean fg = intent.getBooleanExtra("foreground", false);
foreground.setValue(fg);
for (Core.State state : coreStates.values())
state.setForeground(foreground);
state.setForeground(fg);
}
private void onPoll(Intent intent) {