android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java
| 4 ++++
android/sdremote/src/org/libreoffice/impressremote/StartPresentationActivity.java
| 1 +
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
| 5 +++--
android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
| 3 ++-
4 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 36bb1a3158a5d5a0ce35507799de794b80dfd080
Author: Andrzej J.R. Hunt <andr...@ahunt.org>
Date: Fri Sep 7 11:11:54 2012 +0200
Fix some serviceconnection issues and more bluetooth power managment.
Change-Id: Id2e309ee5b8f6feff845dba28e7474e2246865f5
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java
index 76641f9..0733473 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java
@@ -83,9 +83,13 @@ public class PairingActivity extends SherlockActivity {
@Override
public void onReceive(Context aContext, Intent aIntent) {
+ if (mCommunicationService == null) {
+ return;
+ }
if (aIntent.getAction().equals(
CommunicationService.MSG_PAIRING_STARTED)) {
String aPin = aIntent.getStringExtra("PIN");
+
mPinText.setText(aPin);
// refreshLists();
} else if (aIntent.getAction().equals(
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/StartPresentationActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/StartPresentationActivity.java
index b21fe66..98026fd 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/StartPresentationActivity.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/StartPresentationActivity.java
@@ -41,6 +41,7 @@ public class StartPresentationActivity extends
SherlockActivity {
@Override
protected void onDestroy() {
super.onDestroy();
+ unbindService(mConnection);
LocalBroadcastManager.getInstance(this).unregisterReceiver(mListener);
}
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
index dc1d6d0..c495e4c 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
@@ -29,11 +29,12 @@ public class BluetoothClient extends Client {
private BluetoothAdapter mAdapter;
public BluetoothClient(Server aServer,
- CommunicationService aCommunicationService) {
+ CommunicationService aCommunicationService,
+ boolean aBluetoothWasEnabled) {
super(aServer, aCommunicationService);
try {
mAdapter = BluetoothAdapter.getDefaultAdapter();
- mBluetoothWasEnabled = mAdapter.isEnabled();
+ mBluetoothWasEnabled = aBluetoothWasEnabled;
if (!mBluetoothWasEnabled) {
mAdapter.enable();
}
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
index 8a8290d..8a42f70 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
@@ -89,7 +89,8 @@ public class CommunicationService extends Service implements
Runnable {
mClient = new NetworkClient(mServerDesired, this);
break;
case BLUETOOTH:
- mClient = new BluetoothClient(mServerDesired,
this);
+ mClient = new BluetoothClient(mServerDesired, this,
+ mBluetoothPreviouslyEnabled);
break;
}
mTransmitter = new Transmitter(mClient);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
