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

Fix merge

Browse source
This commit is contained in:
Erwan Croze 2017-07-25 17:11:44 +02:00
parent 657c729eb7
commit 6b0e06782e
2 changed files with 1 additions and 1 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,7 +75,6 @@ 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;

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

@ -548,6 +548,7 @@ private static AssistantActivity instance;
if (!newAccount) { if (!newAccount) {
displayRegistrationInProgressDialog(); displayRegistrationInProgressDialog();
} }
accountCreated = true;
} catch (LinphoneCoreException e) { } catch (LinphoneCoreException e) {
Log.e(e); Log.e(e);
} }