Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix on assistant

Browse source
This commit is contained in:
Erwan Croze 2016-11-03 14:43:15 +01:00
parent 2f27891b68
commit 8d171d509d
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml Normal file → Executable file
View file

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

2
release.patch
View file

@ -2,7 +2,7 @@ diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5ef1374..86e13be 100644 index 5ef1374..86e13be 100644
--- a/AndroidManifest.xml --- a/AndroidManifest.xml
+++ b/AndroidManifest.xml +++ b/AndroidManifest.xml
@@ -45,7 +45,7 @@ @@ -52,7 +52,7 @@
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true"/> <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true"/>

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

@ -226,9 +226,9 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
refreshAccounts(); refreshAccounts();
if(state.equals(RegistrationState.RegistrationOk) && LinphonePreferences.instance().getLinkPopupTime() != ""){ if(getResources().getBoolean(R.bool.use_phone_number_validation)) {
if(getResources().getBoolean(R.bool.use_phone_number_validation)) { if (state.equals(RegistrationState.RegistrationOk)) {
if (LinphonePreferences.instance().getLinkPopupTime() == null || (LinphonePreferences.instance().getLinkPopupTime() != null)){ if (LinphonePreferences.instance().getLinkPopupTime() == null || (LinphonePreferences.instance().getLinkPopupTime() != null)) {
LinphoneManager.getInstance().isAccountWithAlias(); LinphoneManager.getInstance().isAccountWithAlias();
} }
} }

2
src/org/linphone/assistant/LinphoneLoginFragment.java
View file

@ -328,9 +328,9 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
dial = accountCreator.getPrefix(phone); dial = accountCreator.getPrefix(phone);
AssistantActivity.instance().linphoneLogIn(login.getText().toString(), password.getText().toString(), dial, null, getResources().getBoolean(R.bool.assistant_account_validation_mandatory)); AssistantActivity.instance().linphoneLogIn(login.getText().toString(), password.getText().toString(), dial, null, getResources().getBoolean(R.bool.assistant_account_validation_mandatory));
} else { } else {
apply.setEnabled(true);
LinphoneUtils.displayErrorAlert(LinphoneUtils.errorForStatus(status), AssistantActivity.instance()); LinphoneUtils.displayErrorAlert(LinphoneUtils.errorForStatus(status), AssistantActivity.instance());
} }
apply.setEnabled(true);
} }
@Override @Override