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

Removed no longer used ChatFragment

Browse source
This commit is contained in:
Sylvain Berfini 2017-11-07 15:14:37 +01:00
parent e57d410384
commit 72ffa9ec52
3 changed files with 8 additions and 1856 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -91,7 +91,6 @@ import org.linphone.fragments.StatusFragment;
import org.linphone.assistant.AssistantActivity; import org.linphone.assistant.AssistantActivity;
import org.linphone.assistant.RemoteProvisioningLoginActivity; import org.linphone.assistant.RemoteProvisioningLoginActivity;
import org.linphone.chat.ChatCreationFragment; import org.linphone.chat.ChatCreationFragment;
import org.linphone.chat.ChatFragment;
import org.linphone.chat.ChatListFragment; import org.linphone.chat.ChatListFragment;
import org.linphone.chat.GroupChatFragment; import org.linphone.chat.GroupChatFragment;
import org.linphone.compatibility.Compatibility; import org.linphone.compatibility.Compatibility;
@ -429,9 +428,6 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
case CHAT_LIST: case CHAT_LIST:
fragment = new ChatListFragment(); fragment = new ChatListFragment();
break; break;
case CHAT:
fragment = new ChatFragment();
break;
case CREATE_CHAT: case CREATE_CHAT:
fragment = new ChatCreationFragment(); fragment = new ChatCreationFragment();
break; break;
@ -772,8 +768,9 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
if (currentFragment == FragmentsAvailable.CHAT_LIST || currentFragment == FragmentsAvailable.CHAT) { if (currentFragment == FragmentsAvailable.CHAT_LIST || currentFragment == FragmentsAvailable.CHAT) {
Fragment fragment2 = getFragmentManager().findFragmentById(R.id.fragmentContainer2); Fragment fragment2 = getFragmentManager().findFragmentById(R.id.fragmentContainer2);
if (fragment2 != null && fragment2.isVisible() && currentFragment == FragmentsAvailable.CHAT && !emptyFragment) { if (fragment2 != null && fragment2.isVisible() && currentFragment == FragmentsAvailable.CHAT && !emptyFragment) {
ChatFragment chatFragment = (ChatFragment) fragment2; /*ChatFragment chatFragment = (ChatFragment) fragment2;
chatFragment.changeDisplayedChat(sipUri, displayName, pictureUri, message, fileUri); chatFragment.changeDisplayedChat(sipUri, displayName, pictureUri, message, fileUri);*/
//TODO
} else { } else {
displayChat(sipUri, message, fileUri, pictureUri, thumbnailUri, displayName, lAddress); displayChat(sipUri, message, fileUri, pictureUri, thumbnailUri, displayName, lAddress);
} }

1846
src/android/org/linphone/chat/ChatFragment.java
View file

File diff suppressed because it is too large Load diff

9
src/android/org/linphone/chat/ChatListFragment.java
View file

@ -63,7 +63,7 @@ import java.util.List;
import static org.linphone.fragments.FragmentsAvailable.CHAT_LIST; import static org.linphone.fragments.FragmentsAvailable.CHAT_LIST;
public class ChatListFragment extends Fragment implements OnClickListener, OnItemClickListener, ContactsUpdatedListener, ChatUpdatedListener { public class ChatListFragment extends Fragment implements OnClickListener, OnItemClickListener, ContactsUpdatedListener {
private LayoutInflater mInflater; private LayoutInflater mInflater;
private List<String> mConversations; private List<String> mConversations;
private ListView chatList; private ListView chatList;
@ -116,8 +116,9 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
} }
}; };
ChatFragment.createIfNotExist(); /*ChatFragment.createIfNotExist();
ChatFragment.addChatListener(this); ChatFragment.addChatListener(this);*/
//TODO
return view; return view;
} }
@ -353,7 +354,7 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
} }
} }
@Override //@Override
public void onChatUpdated() { public void onChatUpdated() {
refresh(); refresh();
} }