mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-25 15:58:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update number version and add https migration

Browse source
This commit is contained in:
Margaux Clerc 2016-02-22 17:39:39 +01:00
parent 179546dacd
commit 21c03ae5fe
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.linphone"
android:versionCode="1000" android:installLocation="auto">
android:versionCode="1002" android:installLocation="auto">
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23"/>
<!-- Permissions for Push Notification -->

8
src/org/linphone/LinphoneActivity.java
View file

@ -136,6 +136,14 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
}
//Obiane specifics
//HTTP to HTTPS migration
if(LinphonePreferences.instance().getRemoteProvisioningUrl() != null) {
if(LinphonePreferences.instance().getRemoteProvisioningUrl().startsWith("http://")) {
LinphonePreferences.instance().setRemoteProvisioningUrl(LinphonePreferences.instance().getRemoteProvisioningUrl().replace("http://", "https://"));
}
}
if (!LinphoneManager.isInstanciated()) {
Log.e("No service running: avoid crash by starting the launch", this.getClass().getName());
finish();