harald/iconsole-android
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ii

Browse source
This commit is contained in:
Harald Hoyer 2017-04-27 16:36:09 +02:00
parent 01250ee86b
commit 3f3280a7c0
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Application/src/main/java/org/surfsite/iconsole/BluetoothChatService.java
View file

@ -180,8 +180,6 @@ public class BluetoothChatService extends Service {
@Override @Override
public void onDestroy() { public void onDestroy() {
stopBT(); stopBT();
// Cancel the persistent notification.
mNM.cancel(NOTIFICATION);
// Tell the user we stopped. // Tell the user we stopped.
Log.i(TAG, "onDestroy"); Log.i(TAG, "onDestroy");
@ -194,12 +192,11 @@ public class BluetoothChatService extends Service {
private void showNotification() { private void showNotification() {
// In this sample, we'll use the same text for the ticker and the expanded notification // In this sample, we'll use the same text for the ticker and the expanded notification
CharSequence text = getText(R.string.local_service_started); CharSequence text = getText(R.string.local_service_started);
Intent myIntent = new Intent(getApplicationContext(), MainActivity.class); Intent myIntent = new Intent(this, MainActivity.class);
myIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); myIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
// The PendingIntent to launch our activity if the user selects this notification // The PendingIntent to launch our activity if the user selects this notification
PendingIntent contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, PendingIntent contentIntent = PendingIntent.getActivity(this, 0, myIntent, 0);
myIntent, 0);
// Set the info for the views that show in the notification panel. // Set the info for the views that show in the notification panel.
Notification notification = new Notification.Builder(this) Notification notification = new Notification.Builder(this)
@ -258,7 +255,6 @@ public class BluetoothChatService extends Service {
// Start the thread to manage the connection and perform transmissions // Start the thread to manage the connection and perform transmissions
mConnectedThread = new ConnectedThread(socket); mConnectedThread = new ConnectedThread(socket);
mConnectedThread.start(); mConnectedThread.start();
showNotification();
// Send the name of the connected device back to the UI Activity // Send the name of the connected device back to the UI Activity
Message msg = mHandler.obtainMessage(Constants.MESSAGE_DEVICE_NAME); Message msg = mHandler.obtainMessage(Constants.MESSAGE_DEVICE_NAME);
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
@ -274,6 +270,8 @@ public class BluetoothChatService extends Service {
*/ */
public synchronized void stopBT() { public synchronized void stopBT() {
Log.d(TAG, "stopBT"); Log.d(TAG, "stopBT");
// Cancel the persistent notification.
mNM.cancel(NOTIFICATION);
if (mConnectThread != null) { if (mConnectThread != null) {
mConnectThread.cancel(); mConnectThread.cancel();
@ -462,6 +460,8 @@ public class BluetoothChatService extends Service {
} }
public void run() { public void run() {
showNotification();
Log.i(TAG, "BEGIN mConnectedThread"); Log.i(TAG, "BEGIN mConnectedThread");
while (mState == STATE_CONNECTED) { while (mState == STATE_CONNECTED) {
@ -476,6 +476,8 @@ public class BluetoothChatService extends Service {
} }
} }
Log.i(TAG, "END mConnectedThread"); Log.i(TAG, "END mConnectedThread");
// Cancel the persistent notification.
mNM.cancel(NOTIFICATION);
} }
@ -493,6 +495,7 @@ public class BluetoothChatService extends Service {
} catch (IOException e) { } catch (IOException e) {
Log.e(TAG, "close() of connect socket failed", e); Log.e(TAG, "close() of connect socket failed", e);
} }
} }
} }
} }