gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-06 06:15:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix chat & add avatars

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-05-10 21:41:34 +02:00
parent a2c45a3736
commit f412ee4ca6
5 changed files with 107 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

@ -47,6 +47,9 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import com.bluelinelabs.logansquare.LoganSquare;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.bitmap.CircleCrop;
import com.bumptech.glide.request.RequestOptions;
import com.nextcloud.talk.R;
import com.nextcloud.talk.api.NcApi;
import com.nextcloud.talk.application.NextcloudTalkApplication;
@ -57,6 +60,8 @@ import com.nextcloud.talk.models.database.UserEntity;
import com.nextcloud.talk.models.json.call.CallOverall;
import com.nextcloud.talk.models.json.capabilities.CapabilitiesOverall;
import com.nextcloud.talk.models.json.generic.GenericOverall;
import com.nextcloud.talk.models.json.participants.Participant;
import com.nextcloud.talk.models.json.participants.ParticipantsOverall;
import com.nextcloud.talk.models.json.rooms.Room;
import com.nextcloud.talk.models.json.rooms.RoomsOverall;
import com.nextcloud.talk.models.json.signaling.DataChannelMessage;
@ -72,6 +77,7 @@ import com.nextcloud.talk.utils.ApiUtils;
import com.nextcloud.talk.utils.animations.PulseAnimation;
import com.nextcloud.talk.utils.bundle.BundleKeys;
import com.nextcloud.talk.utils.database.user.UserUtils;
import com.nextcloud.talk.utils.glide.GlideApp;
import com.nextcloud.talk.utils.preferences.AppPreferences;
import com.nextcloud.talk.webrtc.MagicAudioManager;
import com.nextcloud.talk.webrtc.MagicPeerConnectionWrapper;
@ -110,6 +116,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
@ -128,6 +135,7 @@ import io.reactivex.schedulers.Schedulers;
import me.zhanghai.android.effortlesspermissions.AfterPermissionDenied;
import me.zhanghai.android.effortlesspermissions.EffortlessPermissions;
import me.zhanghai.android.effortlesspermissions.OpenAppDetailsDialogFragment;
import okhttp3.Cache;
import pub.devrel.easypermissions.AfterPermissionGranted;
@AutoInjector(NextcloudTalkApplication.class)
@ -172,6 +180,8 @@ public class CallActivity extends AppCompatActivity {
CookieManager cookieManager;
@Inject
AppPreferences appPreferences;
@Inject
Cache cache;
PeerConnectionFactory peerConnectionFactory;
MediaConstraints audioConstraints;
@ -197,8 +207,8 @@ public class CallActivity extends AppCompatActivity {
private MediaStream localMediaStream;
private String credentials;
private List<MagicPeerConnectionWrapper> magicPeerConnectionWrapperList = new ArrayList<>();
private Map<String, Participant> participantMap = new HashMap<>();
private List<String> basicUISetupList = new ArrayList<>();
private boolean videoOn = false;
private boolean audioOn = false;
@ -261,6 +271,12 @@ public class CallActivity extends AppCompatActivity {
callControls.setZ(100.0f);
basicInitialization();
try {
cache.evictAll();
} catch (IOException e) {
Log.e(TAG, "Failed to evict cache");
}
if (!userEntity.getCurrent()) {
userUtils.createOrUpdateUser(null,
null, null, null,
@ -273,7 +289,6 @@ public class CallActivity extends AppCompatActivity {
@Override
public void onNext(UserEntity userEntity) {
cookieManager.getCookieStore().removeAll();
userUtils.disableAllUsersWithoutId(userEntity.getId());
if (getIntent().getExtras().containsKey("fromNotification")) {
handleFromNotification();
@ -1088,6 +1103,10 @@ public class CallActivity extends AppCompatActivity {
return;
}
if (newSessions.size() > 0) {
getPeersForCall();
}
for (String sessionId : newSessions) {
alwaysGetPeerConnectionWrapperForSessionId(sessionId);
}
@ -1098,6 +1117,36 @@ public class CallActivity extends AppCompatActivity {
}
private void getPeersForCall() {
ncApi.getPeersForCall(credentials, ApiUtils.getUrlForCall(baseUrl, roomToken))
.subscribeOn(Schedulers.newThread())
.subscribe(new Observer<ParticipantsOverall>() {
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onNext(ParticipantsOverall participantsOverall) {
participantMap = new HashMap<>();
for (Participant participant : participantsOverall.getOcs().getData()) {
participantMap.put(participant.getSessionId(), participant);
runOnUiThread(() -> setupAvatarForSession(participant.getSessionId()));
}
}
@Override
public void onError(Throwable e) {
}
@Override
public void onComplete() {
}
});
}
private void deleteMagicPeerConnection(MagicPeerConnectionWrapper magicPeerConnectionWrapper) {
magicPeerConnectionWrapper.removePeerConnection();
magicPeerConnectionWrapperList.remove(magicPeerConnectionWrapper);
@ -1239,9 +1288,29 @@ public class CallActivity extends AppCompatActivity {
}
}
private void setupAvatarForSession(String session) {
RelativeLayout relativeLayout = remoteRenderersLayout.findViewWithTag(session);
if (relativeLayout != null) {
ImageView avatarImageView = relativeLayout.findViewById(R.id.avatarImageView);
if (participantMap.containsKey(session) && avatarImageView.getDrawable() == null) {
int size = Math.round(getResources().getDimension(R.dimen.avatar_size_big));
GlideApp.with(this)
.asBitmap()
.diskCacheStrategy(DiskCacheStrategy.NONE)
.load(ApiUtils.getUrlForAvatarWithName(baseUrl, participantMap.get(session).getUserId(), true))
.centerInside()
.override(size, size)
.apply(RequestOptions.bitmapTransform(new CircleCrop()))
.into(avatarImageView);
}
}
}
private void setupNewPeerLayout(String session) {
if (remoteRenderersLayout.findViewWithTag(session) == null) {
basicUISetupList.add(session);
runOnUiThread(() -> {
RelativeLayout relativeLayout = (RelativeLayout)
getLayoutInflater().inflate(R.layout.call_item, remoteRenderersLayout,
@ -1249,6 +1318,7 @@ public class CallActivity extends AppCompatActivity {
relativeLayout.setTag(session);
SurfaceViewRenderer surfaceViewRenderer = relativeLayout.findViewById(R.id
.surface_view);
surfaceViewRenderer.setMirror(false);
surfaceViewRenderer.init(rootEglBase.getEglBaseContext(), null);
surfaceViewRenderer.setZOrderMediaOverlay(false);
@ -1258,8 +1328,8 @@ public class CallActivity extends AppCompatActivity {
surfaceViewRenderer.setOnClickListener(videoOnClickListener);
remoteRenderersLayout.addView(relativeLayout);
gotNick(session, getPeerConnectionWrapperForSessionId(session).getNick());
setupAvatarForSession(session);
basicUISetupList.remove(session);
callControls.setZ(100.0f);
});
}
@ -1347,7 +1417,7 @@ public class CallActivity extends AppCompatActivity {
@Subscribe(threadMode = ThreadMode.BACKGROUND)
public void onMessageEvent(PeerConnectionEvent peerConnectionEvent) {
if (peerConnectionEvent.getPeerConnectionEventType().equals(PeerConnectionEvent.PeerConnectionEventType
if (peerConnectionEvent.getPeerConnectionEventType().equals(PeerConnectionEvent.PeerConnectionEventType
.PEER_CLOSED)) {
endPeerConnection(peerConnectionEvent.getSessionId());
} else if (peerConnectionEvent.getPeerConnectionEventType().equals(PeerConnectionEvent

32
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View File

@ -34,6 +34,7 @@ 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.Menu;
import android.view.MenuInflater;
@ -84,6 +85,7 @@ import com.webianks.library.PopupBubble;
import org.parceler.Parcels;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@ -98,6 +100,7 @@ import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
import okhttp3.Cache;
import retrofit2.Response;
@AutoInjector(NextcloudTalkApplication.class)
@ -109,6 +112,8 @@ public class ChatController extends BaseController implements MessagesListAdapte
NcApi ncApi;
@Inject
UserUtils userUtils;
@Inject
Cache cache;
@BindView(R.id.input)
MessageInput messageInput;
@ -131,6 +136,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
private Autocomplete mentionAutocomplete;
private LinearLayoutManager layoutManager;
private boolean lookingIntoFuture = false;
private int newMessagesCount = 0;
@ -161,6 +167,12 @@ public class ChatController extends BaseController implements MessagesListAdapte
if (adapter == null) {
try {
cache.evictAll();
} catch (IOException e) {
Log.e(TAG, "Failed to evict cache");
}
adapterWasNull = true;
MessagesListAdapter.HoldersConfig holdersConfig = new MessagesListAdapter.HoldersConfig();
@ -373,6 +385,10 @@ public class ChatController extends BaseController implements MessagesListAdapte
}
private void pullChatMessages(int lookIntoFuture) {
if (!lookingIntoFuture && lookIntoFuture == 1) {
lookingIntoFuture = true;
}
Map<String, Integer> fieldMap = new HashMap<>();
fieldMap.put("lookIntoFuture", lookIntoFuture);
fieldMap.put("limit", 25);
@ -449,11 +465,6 @@ public class ChatController extends BaseController implements MessagesListAdapte
private void processMessages(Response response, boolean isFromTheFuture) {
if (response.code() == 200) {
boolean shouldForceFuture = false;
if (globalLastKnownFutureMessageId == -1) {
shouldForceFuture = true;
}
ChatOverall chatOverall = (ChatOverall) response.body();
List<ChatMessage> chatMessageList = chatOverall.getOcs().getData();
@ -465,7 +476,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
globalLastKnownPastMessageId = chatMessageList.get(i).getJsonMessageId();
}
if (shouldForceFuture) {
if (globalLastKnownFutureMessageId == -1) {
if (chatMessageList.get(i).getJsonMessageId() > globalLastKnownFutureMessageId) {
globalLastKnownFutureMessageId = chatMessageList.get(i).getJsonMessageId();
}
@ -477,7 +488,8 @@ public class ChatController extends BaseController implements MessagesListAdapte
} else {
for (int i = 0; i < chatMessageList.size(); i++) {
chatMessageList.get(i).setBaseUrl(currentUser.getBaseUrl());
boolean shouldScroll = layoutManager.findFirstVisibleItemPosition() == 0;
boolean shouldScroll = layoutManager.findFirstVisibleItemPosition() == 0 ||
adapter.getItemCount() == 0;
if (!shouldScroll) {
if (!popupBubble.isShown()) {
@ -500,11 +512,15 @@ public class ChatController extends BaseController implements MessagesListAdapte
}
}
if (shouldForceFuture) {
if (!lookingIntoFuture) {
pullChatMessages(1);
}
} else if (response.code() == 304 && !isFromTheFuture) {
historyRead = true;
if (!lookingIntoFuture) {
pullChatMessages(1);
}
}
}

6
app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.java
View File

@ -24,8 +24,14 @@ import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.nextcloud.talk.models.json.generic.GenericOCS;
import org.parceler.Parcel;
import java.util.List;
import lombok.Data;
@Parcel
@Data
@JsonObject
public class ParticipantsOCS extends GenericOCS {
@JsonField(name = "data")

4
app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.java
View File

@ -25,8 +25,6 @@ import com.bluelinelabs.logansquare.annotation.JsonObject;
import org.parceler.Parcel;
import java.util.List;
import lombok.Data;
@Parcel
@ -34,5 +32,5 @@ import lombok.Data;
@JsonObject
public class ParticipantsOverall {
@JsonField(name = "ocs")
List<Participant> ocs;
ParticipantsOCS ocs;
}

3
app/src/main/res/layout/call_item.xml
View File

@ -36,8 +36,7 @@
android:layout_width="80dp"
android:layout_height="80dp"
android:id="@+id/avatarImageView"
android:layout_centerInParent="true"
android:src="@drawable/ic_baseline_arrow_downward_24px"/>
android:layout_centerInParent="true"/>
<ImageView
android:id="@+id/remote_video_off"