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

Fix subscription to friendlist

Browse source
This commit is contained in:
Margaux Clerc 2016-09-02 17:25:38 +02:00
parent 3d845d8ee2
commit 329d716273
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1113,7 +1113,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
protected void onPause() { protected void onPause() {
getIntent().putExtra("PreviousActivity", 0); getIntent().putExtra("PreviousActivity", 0);
if(LinphonePreferences.instance().isFriendlistsubscriptionEnabled() && LinphoneManager.getLc().getDefaultProxyConfig() != null){ if(LinphonePreferences.instance().isFriendlistsubscriptionEnabled()){
LinphoneManager.getInstance().subscribeFriendList(!isApplicationBroughtToBackground(this)); LinphoneManager.getInstance().subscribeFriendList(!isApplicationBroughtToBackground(this));
} }
LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull(); LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
@ -1337,8 +1337,10 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
} }
updateMissedChatCount(); updateMissedChatCount();
if(LinphonePreferences.instance().isFriendlistsubscriptionEnabled()){ if(LinphonePreferences.instance().isFriendlistsubscriptionEnabled() && LinphoneManager.getLc().getDefaultProxyConfig() != null){
LinphoneManager.getInstance().subscribeFriendList(true); LinphoneManager.getInstance().subscribeFriendList(true);
} else {
LinphoneManager.getInstance().subscribeFriendList(false);
} }
displayMissedCalls(LinphoneManager.getLc().getMissedCallsCount()); displayMissedCalls(LinphoneManager.getLc().getMissedCallsCount());
@ -1549,6 +1551,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
status.setVisibility(View.GONE); status.setVisibility(View.GONE);
address.setText(""); address.setText("");
statusFragment.resetAccountStatus(); statusFragment.resetAccountStatus();
LinphoneManager.getInstance().subscribeFriendList(false);
defaultAccount.setOnClickListener(new OnClickListener() { defaultAccount.setOnClickListener(new OnClickListener() {
@Override @Override
@ -1672,6 +1675,8 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
accountCreator.setListener(this); accountCreator.setListener(this);
accountCreator.setUsername(LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex())); accountCreator.setUsername(LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex()));
accountCreator.isAccountUsed(); accountCreator.isAccountUsed();
} else {
LinphonePreferences.instance().setInappPopupTime(null);
} }
} }
@ -1754,8 +1759,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
private void askLinkWithPhoneNumber(){ private void askLinkWithPhoneNumber(){
long now = Calendar.getInstance().getTimeInMillis(); long now = Calendar.getInstance().getTimeInMillis();
long newDate = now + (getResources().getInteger(R.integer.popup_time_interval)*60); long newDate = now + (getResources().getInteger(R.integer.popup_time_interval)*60);
Log.w(LinphonePreferences.instance().getLinkPopupTime());
Log.w(now);
if (LinphonePreferences.instance().getLinkPopupTime() != null && Long.parseLong(LinphonePreferences.instance().getLinkPopupTime()) > now) { if (LinphonePreferences.instance().getLinkPopupTime() != null && Long.parseLong(LinphonePreferences.instance().getLinkPopupTime()) > now) {
return; return;
} else { } else {
@ -1765,6 +1768,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
Button delete = (Button) dialog.findViewById(R.id.delete_button); Button delete = (Button) dialog.findViewById(R.id.delete_button);
delete.setText(getResources().getString(R.string.link)); delete.setText(getResources().getString(R.string.link));
Button cancel = (Button) dialog.findViewById(R.id.cancel); Button cancel = (Button) dialog.findViewById(R.id.cancel);
cancel.setText(getResources().getString(R.string.maybe_later));
delete.setOnClickListener(new OnClickListener() { delete.setOnClickListener(new OnClickListener() {
@Override @Override

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

@ -994,6 +994,9 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
public void registrationState(final LinphoneCore lc, final LinphoneProxyConfig proxy,final RegistrationState state,final String message) { public void registrationState(final LinphoneCore lc, final LinphoneProxyConfig proxy,final RegistrationState state,final String message) {
Log.i("New registration state ["+state+"]"); Log.i("New registration state ["+state+"]");
if(LinphoneManager.getLc().getDefaultProxyConfig() == null){
subscribeFriendList(false);
}
} }
private int savedMaxCallWhileGsmIncall; private int savedMaxCallWhileGsmIncall;