Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-09 05:24:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Always call startForeground after startForegroundService

Browse source 
It's an error to e.g. stopSelf() without having called startForeground,
so do it even when about to exit.
This commit is contained in:
Eric House 2018-11-29 18:02:06 -08:00
parent 3fe1289a8d
commit af7b9fcba0
1 changed files with 46 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
View file

@ -56,6 +56,25 @@ import java.util.Set;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
// Notes on running under Oreo
//
// The goal is to be running only when useful: when user wants to play via
// BT. Ideally we'd not run the foreground service when BT is turned off, but
// there's no way to be notified of its being turned on without installing a
// receiver. So *something* has to be running, whether it's listening on a BT
// socket or hosting the receiver. Might as well be the socket listener. Users
// who want the service not running when BT's off can turn it off via app
// preferences. When they try to start a BT game we can note the preference
// and suggest they change it. And when an invitation sent is not received the
// sender can be told to suggest to his opponent to turn on the preference.
//
// When there's no BT adapter at all (Emulator case) there's no point in
// starting the service. Let's catch that early.
//
// Note also that we need to be careful to NEVER call stopSelf() after calling
// startForegroundService() until AFTER calling startForeground(). Doing so
// will cause a crash.
public class BTService extends XWService { public class BTService extends XWService {
private static final String TAG = BTService.class.getSimpleName(); private static final String TAG = BTService.class.getSimpleName();
private static final String BOGUS_MARSHMALLOW_ADDR = "02:00:00:00:00:00"; private static final String BOGUS_MARSHMALLOW_ADDR = "02:00:00:00:00:00";
@ -169,6 +188,7 @@ public class BTService extends XWService {
private BTMsgSink m_btMsgSink; private BTMsgSink m_btMsgSink;
private BTListenerThread m_listener; private BTListenerThread m_listener;
private BTSenderThread m_sender; private BTSenderThread m_sender;
private Notification m_notification; // make once use many
private static int s_errCount = 0; private static int s_errCount = 0;
public static boolean BTAvailable() public static boolean BTAvailable()
@ -388,6 +408,8 @@ public class BTService extends XWService {
@Override @Override
public void onCreate() public void onCreate()
{ {
startForegroundIf();
BluetoothAdapter adapter = XWApp.BTSUPPORTED BluetoothAdapter adapter = XWApp.BTSUPPORTED
? BluetoothAdapter.getDefaultAdapter() : null; ? BluetoothAdapter.getDefaultAdapter() : null;
if ( null != adapter && adapter.isEnabled() ) { if ( null != adapter && adapter.isEnabled() ) {
@ -406,11 +428,9 @@ public class BTService extends XWService {
@Override @Override
public int onStartCommand( Intent intent, int flags, int startId ) public int onStartCommand( Intent intent, int flags, int startId )
{ {
int result = handleCommand( intent ); startForegroundIf();
if ( Service.START_STICKY == result && ! inForeground() ) { int result = handleCommand( intent );
startForeground();
}
return result; return result;
} }
@ -510,21 +530,30 @@ public class BTService extends XWService {
return result; return result;
} // handleCommand() } // handleCommand()
private void startForeground() private void startForegroundIf()
{ {
Intent notifIntent = GamesListDelegate.makeBackgroundIntent( this ); if ( ! inForeground() ) {
PendingIntent pendIntent = PendingIntent Log.d( TAG, "startForegroundIf(): starting" );
.getActivity(this, Utils.nextRandomInt(), notifIntent, PendingIntent.FLAG_ONE_SHOT);
Notification notification =
new NotificationCompat.Builder( this, Utils.getChannelId(this) )
.setSmallIcon( R.drawable.notify_btservice )
.setContentTitle( BTService.class.getSimpleName() )
.setContentText("listening for bluetooth messages...")
.setContentIntent(pendIntent)
.build();
Log.d( TAG, "calling service.startForeground()" ); if ( null == m_notification ) {
startForeground( 1337, notification ); Intent notifIntent = GamesListDelegate.makeBackgroundIntent( this );
PendingIntent pendIntent = PendingIntent
.getActivity( this, Utils.nextRandomInt(), notifIntent,
PendingIntent.FLAG_ONE_SHOT );
m_notification =
new NotificationCompat.Builder( this, Utils.getChannelId(this) )
.setSmallIcon( R.drawable.notify_btservice )
.setContentTitle( BTService.class.getSimpleName() )
.setContentText("listening for bluetooth messages...")
.setContentIntent(pendIntent)
.build();
}
Log.d( TAG, "calling service.startForeground()" );
startForeground( R.string.app_name, m_notification );
} else {
Log.d( TAG, "startForegroundIf(): NOT starting" );
}
} }
private class BTListenerThread extends Thread { private class BTListenerThread extends Thread {