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

Merge remote-tracking branch 'origin/beta_android'

Browse source
This commit is contained in:
Erwan Croze 2017-07-25 17:08:05 +02:00
commit 657c729eb7
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/android/org/linphone/ChatFragment.java
View file

@ -75,6 +75,7 @@ import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import org.linphone.compatibility.Compatibility; import org.linphone.compatibility.Compatibility;
import org.linphone.core.LinphoneAccountCreator;
import org.linphone.core.LinphoneAddress; import org.linphone.core.LinphoneAddress;
import org.linphone.core.LinphoneBuffer; import org.linphone.core.LinphoneBuffer;
import org.linphone.core.LinphoneChatMessage; import org.linphone.core.LinphoneChatMessage;

2
src/android/org/linphone/assistant/AssistantActivity.java
View file

@ -361,7 +361,6 @@ private static AssistantActivity instance;
} }
identity = identity.replace("?", accountCreator.getUsername()); identity = identity.replace("?", accountCreator.getUsername());
addr = LinphoneCoreFactory.instance().createLinphoneAddress(identity); addr = LinphoneCoreFactory.instance().createLinphoneAddress(identity);
addr.setDisplayName(accountCreator.getUsername()); addr.setDisplayName(accountCreator.getUsername());
address = addr; address = addr;
proxyConfig.edit(); proxyConfig.edit();
@ -549,7 +548,6 @@ private static AssistantActivity instance;
if (!newAccount) { if (!newAccount) {
displayRegistrationInProgressDialog(); displayRegistrationInProgressDialog();
} }
accountCreated = true;
} catch (LinphoneCoreException e) { } catch (LinphoneCoreException e) {
Log.e(e); Log.e(e);
} }