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

fix small issues

Browse source
This commit is contained in:
Margaux Clerc 2015-11-10 17:53:12 +01:00
parent a5c39de505
commit d279336e33
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/org/linphone/CallActivity.java
View file

@ -26,13 +26,11 @@ import org.linphone.core.LinphoneCall.State;
import org.linphone.core.LinphoneCallParams;
import org.linphone.core.LinphoneCore;
import org.linphone.core.LinphoneCoreException;
import org.linphone.core.LinphoneCoreFactory;
import org.linphone.core.LinphoneCoreListenerBase;
import org.linphone.core.LinphonePlayer;
import org.linphone.mediastream.Log;
import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
import org.linphone.ui.Numpad;
import org.w3c.dom.Text;
import android.app.Activity;
import android.app.Dialog;
@ -42,7 +40,6 @@ import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.os.Handler;

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

@ -595,8 +595,10 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
backToCall.setVisibility(View.VISIBLE);
startCall.setVisibility(View.INVISIBLE);
} else {
backToCall.setVisibility(View.INVISIBLE);
startCall.setVisibility(View.VISIBLE);
if(!newChatConversation) {
backToCall.setVisibility(View.INVISIBLE);
startCall.setVisibility(View.VISIBLE);
}
}
LinphoneAddress lAddress;

2
src/org/linphone/ChatStorage.java
View file

@ -78,7 +78,7 @@ public class ChatStorage {
private ChatStorage(Context c) {
context = c;
boolean useLinphoneStorage = false;
boolean useLinphoneStorage = true;
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(LinphoneService.instance());
boolean updateNeeded = prefs.getBoolean(c.getString(R.string.pref_first_time_linphone_chat_storage), !LinphonePreferences.instance().isFirstLaunch());
updateNeeded = updateNeeded && !isVersionUsingNewChatStorage();

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

@ -148,7 +148,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
}
boolean useFirstLoginActivity = getResources().getBoolean(R.bool.display_account_wizard_at_first_start);
if (LinphonePreferences.instance().isProvisioningLoginViewEnabled()) {
if (LinphonePreferences.instance().isProvisioningLoginViewEnabled() && LinphonePreferences.instance().isFirstLaunch() && LinphoneManager.getLc().getDefaultProxyConfig() == null) {
Intent wizard = new Intent();
wizard.setClass(this, RemoteProvisioningLoginActivity.class);
wizard.putExtra("Domain", LinphoneManager.getInstance().wizardLoginViewDomain);

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

@ -97,7 +97,7 @@ public class RemoteProvisioningLoginActivity extends Activity implements OnClick
private boolean storeAccount(String username, String password, String domain) {
LinphoneCore lc = LinphoneManager.getLc();
LinphonePreferences.instance().setRemoteProvisioningUrl("http://elviish.ovh/a69c387b85101abacb3580bf4c570bce.xml");
LinphonePreferences.instance().setRemoteProvisioningUrl("https://elviish.ovh/obiane1.xml");
LinphoneManager.getInstance().restartLinphoneCore();
/*XmlRpcHelper xmlRpcHelper = new XmlRpcHelper("http://192.168.0.148:8080/xmlrpc");