diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index dd10ed1..2320f64 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
-
+
- Bluetooth is required for this app.
+ Please enable Bluetooth to access the complete app functionality.
diff --git a/android/src/main/scala/com/nutomic/ensichat/activities/MainActivity.scala b/android/src/main/scala/com/nutomic/ensichat/activities/MainActivity.scala
index 666703b..fd8f491 100644
--- a/android/src/main/scala/com/nutomic/ensichat/activities/MainActivity.scala
+++ b/android/src/main/scala/com/nutomic/ensichat/activities/MainActivity.scala
@@ -44,7 +44,8 @@ class MainActivity extends EnsichatActivity {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
- if (getIntent.getAction == MainActivity.ActionRequestBluetooth) {
+ if (getIntent.getAction == MainActivity.ActionRequestBluetooth &&
+ Option(BluetoothAdapter.getDefaultAdapter).isDefined) {
val intent = new Intent(BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE)
intent.putExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION, 0)
startActivityForResult(intent, RequestSetDiscoverable)
@@ -89,8 +90,7 @@ class MainActivity extends EnsichatActivity {
requestCode match {
case RequestSetDiscoverable =>
if (resultCode == Activity.RESULT_CANCELED) {
- Toast.makeText(this, R.string.bluetooth_required, Toast.LENGTH_LONG).show()
- finish()
+ Toast.makeText(this, R.string.toast_bluetooth_denied, Toast.LENGTH_LONG).show()
}
}
diff --git a/android/src/main/scala/com/nutomic/ensichat/service/ChatService.scala b/android/src/main/scala/com/nutomic/ensichat/service/ChatService.scala
index 73d321c..8ae8eef 100644
--- a/android/src/main/scala/com/nutomic/ensichat/service/ChatService.scala
+++ b/android/src/main/scala/com/nutomic/ensichat/service/ChatService.scala
@@ -3,6 +3,7 @@ package com.nutomic.ensichat.service
import java.io.File
import android.app.Service
+import android.bluetooth.BluetoothAdapter
import android.content.{Context, Intent}
import android.os.Handler
import com.nutomic.ensichat.bluetooth.BluetoothInterface
@@ -47,8 +48,10 @@ class ChatService extends Service {
override def onCreate(): Unit = {
super.onCreate()
notificationHandler.showPersistentNotification()
- connectionHandler.addTransmissionInterface(new BluetoothInterface(this, new Handler(),
- connectionHandler))
+ if (Option(BluetoothAdapter.getDefaultAdapter).isDefined) {
+ connectionHandler.addTransmissionInterface(new BluetoothInterface(this, new Handler(),
+ connectionHandler))
+ }
connectionHandler.start()
}