diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a8a39ff7d..91b98e779 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionCode="2120" android:installLocation="auto"> diff --git a/res/values-RU/strings.xml b/res/values-RU/strings.xml index a25ef7733..0a501cfa1 100755 --- a/res/values-RU/strings.xml +++ b/res/values-RU/strings.xml @@ -355,6 +355,9 @@ Видео Микрофон Громкость + Маршрут + Получатель + Bluetooth Настройки Послать @@ -384,6 +387,7 @@ хочет поделиться своим статусом с Вами и получать обновления Вашего статуса. Идёт настройка шумоподавления Общий сервер + Удалённое резервирование Удалить контакт адрес SIP @@ -413,4 +417,7 @@ Входящий Фоновый режим + + Скачать + Ошибка скачивания. Проверьте ваше интернет соединение или попробуйте позже. diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java index eeab05a80..d419f3288 100644 --- a/src/org/linphone/InCallActivity.java +++ b/src/org/linphone/InCallActivity.java @@ -228,7 +228,7 @@ public class InCallActivity extends FragmentActivity implements routeBluetooth = (TextView) findViewById(R.id.routeBluetooth); routeBluetooth.setOnClickListener(this); } catch (NullPointerException npe) { - Log.e("Audio routes menu disabled on tablets for now"); + Log.e("Bluetooth: Audio routes menu disabled on tablets for now (1)"); } switchCamera = (ImageView) findViewById(R.id.switchCamera); @@ -251,16 +251,18 @@ public class InCallActivity extends FragmentActivity implements if (LinphoneManager.getInstance().isBluetoothScoConnected) { try { - routeLayout.setVisibility(View.VISIBLE); + if (routeLayout != null) + routeLayout.setVisibility(View.VISIBLE); audioRoute.setVisibility(View.VISIBLE); speaker.setVisibility(View.GONE); - } catch (NullPointerException npe) {} + } catch (NullPointerException npe) { Log.e("Bluetooth: Audio routes menu disabled on tablets for now (2)"); } } else { try { - routeLayout.setVisibility(View.GONE); + if (routeLayout != null) + routeLayout.setVisibility(View.GONE); audioRoute.setVisibility(View.GONE); speaker.setVisibility(View.VISIBLE); - } catch (NullPointerException npe) {} + } catch (NullPointerException npe) { Log.e("Bluetooth: Audio routes menu disabled on tablets for now (3)"); } } } @@ -299,7 +301,7 @@ public class InCallActivity extends FragmentActivity implements } } } catch (NullPointerException npe) { - Log.e("Audio routes menu disabled on tablets for now"); + Log.e("Bluetooth: Audio routes menu disabled on tablets for now (4)"); } if (isMicMuted) { diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 2e205fddd..3fd051b08 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -266,6 +266,7 @@ public class LinphoneManager implements LinphoneCoreListener { public void onServiceConnected(int profile, BluetoothProfile proxy) { if (profile == BluetoothProfile.HEADSET) { mBluetoothHeadset = (BluetoothHeadset) proxy; + isBluetoothScoConnected = true; Log.d("Bluetooth headset connected"); } } @@ -273,8 +274,8 @@ public class LinphoneManager implements LinphoneCoreListener { public void onServiceDisconnected(int profile) { if (profile == BluetoothProfile.HEADSET) { mBluetoothHeadset = null; - Log.d("Bluetooth headset disconnected"); isBluetoothScoConnected = false; + Log.d("Bluetooth headset disconnected"); routeAudioToReceiver(); } }