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

Fixed no going back to GroupInfo once back has been pressed issue

Browse source
This commit is contained in:
Sylvain Berfini 2017-10-23 16:01:09 +02:00
parent 35da6ddfd0
commit 6c406d42a9
4 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/android/org/linphone/activities/LinphoneActivity.java
View file

@ -370,6 +370,11 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
newProxyConfig = true; newProxyConfig = true;
} }
public void popBackStack() {
getFragmentManager().popBackStackImmediate();
currentFragment = FragmentsAvailable.EMPTY;
}
private void changeCurrentFragment(FragmentsAvailable newFragmentType, Bundle extras) { private void changeCurrentFragment(FragmentsAvailable newFragmentType, Bundle extras) {
changeCurrentFragment(newFragmentType, extras, false); changeCurrentFragment(newFragmentType, extras, false);
} }

3
src/android/org/linphone/chat/ChatCreationFragment.java
View file

@ -39,6 +39,7 @@ import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import org.linphone.contacts.ContactAddress; import org.linphone.contacts.ContactAddress;
import org.linphone.mediastream.Log;
import org.linphone.ui.ContactSelectView; import org.linphone.ui.ContactSelectView;
import org.linphone.receivers.ContactsUpdatedListener; import org.linphone.receivers.ContactsUpdatedListener;
import org.linphone.activities.LinphoneActivity; import org.linphone.activities.LinphoneActivity;
@ -279,7 +280,7 @@ public class ChatCreationFragment extends Fragment implements View.OnClickListen
allContactsSelected.setVisibility(View.INVISIBLE); allContactsSelected.setVisibility(View.INVISIBLE);
updateList(); updateList();
} else if (id == R.id.back) { } else if (id == R.id.back) {
getFragmentManager().popBackStackImmediate(); LinphoneActivity.instance().popBackStack();
} else if (id == R.id.next) { } else if (id == R.id.next) {
if (contactsSelected.size() == 1) { if (contactsSelected.size() == 1) {
LinphoneActivity.instance().displayChat(contactsSelected.get(0).getAddress(), "", ""); LinphoneActivity.instance().displayChat(contactsSelected.get(0).getAddress(), "", "");

2
src/android/org/linphone/chat/GroupChatFragment.java
View file

@ -86,7 +86,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener {
mBackButton.setOnClickListener(new View.OnClickListener() { mBackButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
getFragmentManager().popBackStackImmediate(); LinphoneActivity.instance().popBackStack();
} }
}); });

5
src/android/org/linphone/chat/GroupInfoFragment.java
View file

@ -32,6 +32,7 @@ import android.widget.LinearLayout;
import android.widget.ListView; import android.widget.ListView;
import org.linphone.R; import org.linphone.R;
import org.linphone.activities.LinphoneActivity;
import org.linphone.contacts.ContactAddress; import org.linphone.contacts.ContactAddress;
import java.util.ArrayList; import java.util.ArrayList;
@ -78,7 +79,7 @@ public class GroupInfoFragment extends Fragment {
mBackButton.setOnClickListener(new View.OnClickListener() { mBackButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
getFragmentManager().popBackStackImmediate(); LinphoneActivity.instance().popBackStack();
} }
}); });
@ -100,7 +101,7 @@ public class GroupInfoFragment extends Fragment {
if (mIsAlreadyCreatedGroup) { if (mIsAlreadyCreatedGroup) {
//TODO //TODO
} else { } else {
getFragmentManager().popBackStackImmediate(); LinphoneActivity.instance().popBackStack();
} }
} }
}); });