diff --git a/app/src/main/java/org/linphone/LinphoneManager.java b/app/src/main/java/org/linphone/LinphoneManager.java index cd49efb0f..94c54598b 100644 --- a/app/src/main/java/org/linphone/LinphoneManager.java +++ b/app/src/main/java/org/linphone/LinphoneManager.java @@ -314,15 +314,6 @@ public class LinphoneManager implements SensorEventListener { private void destroyCore() { Log.w("[Manager] Destroying Core"); - if (LinphonePreferences.instance() != null) { - // We set network reachable at false before destroying the Core - // to not send a register with expires at 0 - if (LinphonePreferences.instance().isPushNotificationEnabled()) { - Log.w( - "[Manager] Setting network reachability to False to prevent unregister and allow incoming push notifications"); - mCore.setNetworkReachable(false); - } - } mCore.stop(); mCore.removeListener(mCoreListener); } diff --git a/app/src/main/java/org/linphone/activities/MainActivity.java b/app/src/main/java/org/linphone/activities/MainActivity.java index f2ca78da1..86017f275 100644 --- a/app/src/main/java/org/linphone/activities/MainActivity.java +++ b/app/src/main/java/org/linphone/activities/MainActivity.java @@ -559,6 +559,7 @@ public abstract class MainActivity extends LinphoneGenericActivity if (LinphoneContext.isReady()) { ContactsManager.getInstance().enableContactsAccess(); ContactsManager.getInstance().initializeContactManager(); + ContactsManager.getInstance().fetchContactsAsync(); } } } else if (permissions[i].equals(Manifest.permission.READ_EXTERNAL_STORAGE)) { diff --git a/app/src/main/java/org/linphone/call/CallActivity.java b/app/src/main/java/org/linphone/call/CallActivity.java index 91533aa2f..ab97dbcf7 100644 --- a/app/src/main/java/org/linphone/call/CallActivity.java +++ b/app/src/main/java/org/linphone/call/CallActivity.java @@ -1122,7 +1122,8 @@ public class CallActivity extends LinphoneGenericActivity if (mCore.isInConference()) { displayConferenceCall(call); conferenceDisplayed = true; - } else if (!pausedConferenceDisplayed) { + } else if (!pausedConferenceDisplayed + && mCore.getCallsNb() > 1) { // Workaround for temporary SDK issue displayPausedConference(); pausedConferenceDisplayed = true; } diff --git a/app/src/main/java/org/linphone/contacts/ContactsFragment.java b/app/src/main/java/org/linphone/contacts/ContactsFragment.java index 0d6028d75..1ea2d0c63 100644 --- a/app/src/main/java/org/linphone/contacts/ContactsFragment.java +++ b/app/src/main/java/org/linphone/contacts/ContactsFragment.java @@ -216,6 +216,7 @@ public class ContactsFragment extends Fragment @Override public void onResume() { super.onResume(); + ContactsManager.getInstance().addContactsListener(this); mOnlyDisplayLinphoneContacts = @@ -224,6 +225,7 @@ public class ContactsFragment extends Fragment changeContactsToggle(); invalidate(); + onContactsUpdated(); ((ContactsActivity) (getActivity())).showTabBar(); } diff --git a/app/src/main/java/org/linphone/service/LinphoneService.java b/app/src/main/java/org/linphone/service/LinphoneService.java index b08aa85b1..47ba8365f 100644 --- a/app/src/main/java/org/linphone/service/LinphoneService.java +++ b/app/src/main/java/org/linphone/service/LinphoneService.java @@ -107,11 +107,6 @@ public final class LinphoneService extends Service { if (core != null) { core.terminateAllCalls(); } - - // If push is enabled, don't unregister account, otherwise do unregister - if (LinphonePreferences.instance().isPushNotificationEnabled()) { - if (core != null) core.setNetworkReachable(false); - } stopSelf(); } super.onTaskRemoved(rootIntent);