Merge branch 'master' of git.linphone.org:linphone-android into belle-sip

AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.linphone"
-      android:versionCode="2100" android:installLocation="auto"> 
+      android:versionCode="2120" android:installLocation="auto"> 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="17"/>
     
     <!-- Permissions for Push Notification -->

res/values-RU/strings.xml

@@ -355,6 +355,9 @@
 	<string name="button_video">Видео</string>
 	<string name="button_micro">Микрофон</string>
 	<string name="button_speaker">Громкость</string>
+    <string name="button_route">Маршрут</string>     
+    <string name="button_receiver">Получатель</string>
+    <string name="button_bluetooth">Bluetooth</string>
 	<string name="button_options">Настройки</string>
 	
 	<string name="button_send_message">Послать</string>
@@ -384,6 +387,7 @@
 	<string name="linphone_friend_new_request_desc">хочет поделиться своим статусом с Вами и получать обновления Вашего статуса.</string>
 	<string name="setup_ec_calibration">Идёт настройка шумоподавления</string>
     <string name="pref_image_sharing_server_title">Общий сервер</string>
+    <string name="pref_remote_provisioning_title">Удалённое резервирование</string>
 	
 	<string name="delete_contact">Удалить контакт</string>
 	<string name="sip_address">адрес SIP</string>
@@ -413,4 +417,7 @@
 	<string name="call_state_incoming">Входящий</string>
 	
 	<string name="pref_background_mode">Фоновый режим</string>
+	
+	<string name="download_image">Скачать</string>
+    <string name="download_image_failed">Ошибка скачивания. Проверьте ваше интернет соединение или попробуйте позже.</string>
 </resources>

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) {

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();
 					    }
 					}