summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorArtur Dryomov <artur.dryomov@gmail.com>2013-07-02 22:07:57 +0300
committerMichael Meeks <michael.meeks@suse.com>2013-07-25 18:01:50 +0100
commitfd5ec7142fcc15d3644a6e2afeb1d2c5a21ec09d (patch)
tree7fef32a19288037c678b4ecafad26a3bfbdd1f94 /android
parent668c57f61d31987b12dc4c41cf4bced022fcbf0d (diff)
Remove preference requirement for TCP servers search.
Change-Id: I4305ccedd487f39ea3ec1a765f55c55aff096fd1
Diffstat (limited to 'android')
-rw-r--r--android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
index 8678286461d9..7718d39cd5e3 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
@@ -203,16 +203,16 @@ public class CommunicationService extends Service implements Runnable, MessagesL
}
public void startSearch() {
- SharedPreferences aPref = PreferenceManager
- .getDefaultSharedPreferences(this);
- boolean bEnableWifi = aPref.getBoolean("option_enablewifi", false);
- if (bEnableWifi)
- mTcpServersFinder.startSearch();
+ mTcpServersFinder.startSearch();
+
BluetoothAdapter aAdapter = BluetoothAdapter.getDefaultAdapter();
if (aAdapter != null) {
mBluetoothPreviouslyEnabled = aAdapter.isEnabled();
- if (!mBluetoothPreviouslyEnabled)
+
+ if (!mBluetoothPreviouslyEnabled) {
aAdapter.enable();
+ }
+
mBluetoothServersFinder.startSearch();
}
}