Skip to content

Commit

Permalink
[SPARK-17124] listing membership for mention
Browse files Browse the repository at this point in the history
  • Loading branch information
@xionxiao
xionxiao committed Jul 12, 2018
1 parent 0a90c38 commit 37dcac1
Show file tree
Hide file tree
Showing 6 changed files with 162 additions and 52 deletions.
14 changes: 8 additions & 6 deletions app/src/main/java/com/cisco/sparksdk/kitchensink/actions/SparkAgent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
package com.cisco.sparksdk.kitchensink.actions;

import android.net.Uri;
import android.os.Environment;
import android.util.Pair;
import android.view.View;

Expand All @@ -36,6 +35,7 @@
import com.cisco.sparksdk.kitchensink.actions.events.RejectEvent;
import com.ciscospark.androidsdk.CompletionHandler;
import com.ciscospark.androidsdk.Spark;
import com.ciscospark.androidsdk.membership.MembershipClient;
import com.ciscospark.androidsdk.message.LocalFile;
import com.ciscospark.androidsdk.message.Mention;
import com.ciscospark.androidsdk.message.Message;
Expand All @@ -45,11 +45,8 @@
import com.ciscospark.androidsdk.phone.CallObserver;
import com.ciscospark.androidsdk.phone.MediaOption;
import com.ciscospark.androidsdk.phone.Phone;
import com.github.benoitdion.ln.Ln;

import java.io.File;
import java.util.ArrayList;
import java.util.Date;

import static com.cisco.sparksdk.kitchensink.actions.events.SparkAgentEvent.postEvent;

Expand Down Expand Up @@ -126,6 +123,11 @@ private void setupIncomingCallListener() {
});
}

public void getMembership(String roomId, CompletionHandler handler) {
MembershipClient client = spark.memberships();
client.list(roomId, null, null, 0, handler);
}

public boolean isCallIncoming() {
return incomingCall != null && !incomingCall.getStatus().equals(Call.CallStatus.DISCONNECTED);
}
Expand All @@ -152,11 +154,11 @@ public void sendMessage(String idOrEmail, String message, Mention[] mentions, Lo


public void downloadThumbnail(RemoteFile file, File saveTo, MessageClient.ProgressHandler handler, CompletionHandler<Uri> completionHandler) {
getMessageClient().downloadThumbnail(file, saveTo.getPath(), handler, completionHandler);
getMessageClient().downloadThumbnail(file, saveTo == null ? null : saveTo.getPath(), handler, completionHandler);
}

public void downloadFile(RemoteFile file, File saveTo, MessageClient.ProgressHandler handler, CompletionHandler<Uri> completionHandler) {
getMessageClient().downloadFile(file, saveTo.getPath(), handler, completionHandler);
getMessageClient().downloadFile(file, saveTo == null ? null : saveTo.getPath(), handler, completionHandler);
}

public void dial(String callee, View localView, View remoteView, View screenSharing) {
Expand Down
153 changes: 122 additions & 31 deletions app/src/main/java/com/cisco/sparksdk/kitchensink/launcher/fragments/MessageFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@
import android.content.Intent;
import android.database.Cursor;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.provider.DocumentsContract;
import android.provider.MediaStore;
import android.support.annotation.NonNull;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand All @@ -28,6 +27,7 @@
import com.cisco.sparksdk.kitchensink.R;
import com.cisco.sparksdk.kitchensink.actions.SparkAgent;
import com.cisco.sparksdk.kitchensink.ui.BaseFragment;
import com.ciscospark.androidsdk.membership.Membership;
import com.ciscospark.androidsdk.message.LocalFile;
import com.ciscospark.androidsdk.message.Mention;
import com.ciscospark.androidsdk.message.Message;
Expand Down Expand Up @@ -59,24 +59,28 @@ public class MessageFragment extends BaseFragment {
EditText text_message;

@BindView(R.id.message_view)
RecyclerView recyclerView;
RecyclerView recyclerView_message;

@BindView(R.id.message_mention)
ImageButton btn_mention;

@BindView(R.id.message_status)
TextView text_status;

@BindView(R.id.mention_text)
TextView text_mention;
@BindView(R.id.membership_recyclerview)
RecyclerView recyclerView_membership;

MessageAdapter adapter;
MessageAdapter adapterMessage;

MembershipAdapter adapterMembership;

SparkAgent agent = SparkAgent.getInstance();

MessageClient messageClient = agent.getMessageClient();

ArrayList<File> selectedFile = new ArrayList<>();
ArrayList<File> selectedFile;

ArrayList<Membership> mentionedMembershipList;

String targetId;

Expand All @@ -96,37 +100,50 @@ private String getTargetId() {

public MessageFragment() {
// Required empty public constructor
selectedFile = new ArrayList<>();
mentionedMembershipList = new ArrayList<>();
}

@Override
public void onActivityCreated(Bundle saved) {
super.onActivityCreated(saved);
recyclerView.setLayoutManager(new LinearLayoutManager(this.getActivity()));
adapter = new MessageAdapter(this.getActivity());
recyclerView.setAdapter(adapter);
recyclerView_message.setLayoutManager(new LinearLayoutManager(this.getActivity()));
adapterMessage = new MessageAdapter(this.getActivity());
recyclerView_message.setAdapter(adapterMessage);

messageClient.setMessageObserver(evt -> {
if (evt instanceof MessageObserver.MessageArrived) {
MessageObserver.MessageArrived event = (MessageObserver.MessageArrived) evt;
Ln.e("message: " + event.getMessage().toString());
adapter.mData.add(event.getMessage());
adapter.notifyDataSetChanged();
if (event.getMessage().getPersonEmail().equals("sparksdktestuser16@tropo.com")) {
text_status.setText("");
}
adapterMessage.mData.add(event.getMessage());
adapterMessage.notifyDataSetChanged();
//if (event.getMessage().getPersonEmail().equals("sparksdktestuser16@tropo.com")) {
text_status.setText("");
//}
} else {
MessageObserver.MessageDeleted event = (MessageObserver.MessageDeleted) evt;
Ln.e("message deleted " + event.getMessageId());
}
});

recyclerView_membership.setLayoutManager(new LinearLayoutManager(this.getActivity()));
adapterMembership = new MembershipAdapter(this.getActivity());
adapterMembership.mData.add(new MembershipAll());
recyclerView_membership.setAdapter(adapterMembership);
}

@Override
public void onStart() {
super.onStart();
text_mention.setVisibility(View.GONE);
//text_mention.setVisibility(View.GONE);
recyclerView_membership.setVisibility(View.GONE);
targetId = getTargetId();
}

@Override
public void onBackPressed() {
super.onBackPressed();
}

private LocalFile[] generateLocalFiles() {
ArrayList<LocalFile> arrayList = new ArrayList<>();
Expand All @@ -152,14 +169,14 @@ private LocalFile[] generateLocalFiles() {
return localFile;
}

private Mention[] generateMentions(String[] mentions) {
private Mention[] generateMentions() {
Mention.MentionAll mentionAll = new Mention.MentionAll();
ArrayList<Mention> mentionList = new ArrayList<>();
for (String s : mentions) {
if (s.toUpperCase().equals("ALL")) {
for (Membership m : this.mentionedMembershipList) {
if (m instanceof MembershipAll) {
mentionList.add(mentionAll);
} else {
Mention.MentionPerson person = new Mention.MentionPerson(s);
Mention.MentionPerson person = new Mention.MentionPerson(m.getPersonId());
mentionList.add(person);
}
}
Expand All @@ -181,24 +198,20 @@ private void hideSoftKeyboard() {
@OnClick(R.id.send_button)
public void sendMessage(View btn) {
if (!TextUtils.isEmpty(text_message.getText())) {
String mention_string = text_mention.getText().toString();
String[] strings = mention_string.split(" ");

btn.setEnabled(false);
agent.sendMessage(targetId,
text_message.getText().toString(),
generateMentions(strings),
generateMentions(),
generateLocalFiles(),
rst -> {
Ln.e("posted:" + rst.toString());
text_mention.setText("");
selectedFile.clear();
btn.setEnabled(true);
});
text_status.setText("sending ...");
text_message.setText("");
}
text_mention.setVisibility(View.GONE);
//text_mention.setVisibility(View.GONE);
text_message.clearFocus();
hideSoftKeyboard();
}
Expand All @@ -217,11 +230,22 @@ public void selectFile() {

@OnClick(R.id.message_mention)
public void mentionPeople() {
if (text_mention.getVisibility() == View.VISIBLE) {
text_mention.setVisibility(View.GONE);
if (recyclerView_membership.getVisibility() != View.VISIBLE) {
recyclerView_membership.setVisibility(View.VISIBLE);
recyclerView_message.setVisibility(View.GONE);
} else {
text_mention.setVisibility(View.VISIBLE);
recyclerView_membership.setVisibility(View.GONE);
recyclerView_message.setVisibility(View.VISIBLE);
}
SparkAgent.getInstance().getMembership(getTargetId(), result -> {
if (result.isSuccessful()) {
List<Membership> list = (List<Membership>) result.getData();
adapterMembership.mData.clear();
adapterMembership.mData.add(new MembershipAll());
adapterMembership.mData.addAll(list);
adapterMembership.notifyDataSetChanged();
}
});
}


Expand All @@ -247,8 +271,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
}
}


public class MessageAdapter extends RecyclerView.Adapter<MessageAdapter.MessageViewHolder> {
class MessageAdapter extends RecyclerView.Adapter<MessageAdapter.MessageViewHolder> {
private final LayoutInflater mLayoutInflater;
private final Context mContext;
private ArrayList<Message> mData;
Expand All @@ -259,6 +282,7 @@ public class MessageAdapter extends RecyclerView.Adapter<MessageAdapter.MessageV
mLayoutInflater = LayoutInflater.from(mContext);
}

@NonNull
@Override
public MessageViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
return new MessageViewHolder(mLayoutInflater.inflate(R.layout.listview_message, parent, false));
Expand Down Expand Up @@ -289,6 +313,7 @@ public void onBindViewHolder(MessageViewHolder holder, int position) {

if (message.getRemoteFiles().get(0).thumbnail != null) {
holder.progressBar.setVisibility(View.VISIBLE);
RemoteFile file = message.getRemoteFiles().get(0);
agent.downloadThumbnail(message.getRemoteFiles().get(0), null, null, (uri) -> {
holder.message_file.setImageURI(uri.getData());
holder.progressBar.setVisibility(View.GONE);
Expand Down Expand Up @@ -360,6 +385,8 @@ public void download(View view) {
Ln.e(msg.toString());
if (msg.getRemoteFiles() != null) {
RemoteFile file = msg.getRemoteFiles().get(0);
if (file == null)
return;
agent.downloadFile(
file,
null,
Expand All @@ -381,6 +408,70 @@ public void download(View view) {
}
}

// fake membership implements ALL
private class MembershipAll extends Membership {
@Override
public String getPersonDisplayName() {
return "ALL";
}
}

class MembershipAdapter extends RecyclerView.Adapter<MembershipAdapter.MembershipViewHolder> {
private final LayoutInflater mLayoutInflater;
private final Context mContext;
private final ArrayList<Membership> mData;

MembershipAdapter(Context context) {
mContext = context;
mData = new ArrayList<>();
mLayoutInflater = LayoutInflater.from(mContext);
}


@NonNull
@Override
public MembershipViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
return new MembershipViewHolder(mLayoutInflater.inflate(R.layout.listitem_membership, parent, false));
}

@Override
public void onBindViewHolder(@NonNull MembershipViewHolder holder, int position) {
Membership membership = mData.get(position);
if (membership instanceof MembershipAll) {
holder.textContent.setText("ALL");
} else {
holder.textContent.setText(membership.getPersonDisplayName());
}
}

@Override
public int getItemCount() {
return mData != null ? mData.size() : 0;
}

class MembershipViewHolder extends RecyclerView.ViewHolder {

@BindView(R.id.text_content)
TextView textContent;

@OnClick(R.id.text_content)
void onMembershipClick() {
int pos = getAdapterPosition();
Membership membership = mData.get(pos);
recyclerView_membership.setVisibility(View.GONE);
recyclerView_message.setVisibility(View.VISIBLE);
mentionedMembershipList.add(membership);
text_message.getText().append("@" + membership.getPersonDisplayName()).append(" ");
}

MembershipViewHolder(View itemView) {
super(itemView);
ButterKnife.bind(this, itemView);
}
}
}


/**
* helper to retrieve the path of an image URI
*/
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/cisco/sparksdk/kitchensink/ui/ListPageAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* Created on 16/09/2017.
*/

public class ListPageAdapter<T extends Fragment> extends FragmentPagerAdapter {
public class ListPageAdapter<T extends BaseFragment> extends FragmentPagerAdapter {
private List<T> fragments;

public ListPageAdapter(FragmentManager fm) {
Expand Down
Loading

0 comments on commit 37dcac1

Please sign in to comment.