mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-23 13:35:33 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix a few crashes

Browse source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-12-10 08:47:53 +01:00
parent e58137ea79
commit 6815021a53
3 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
View file

@ -431,7 +431,7 @@ public class CallNotificationController extends BaseController {
.into(new SimpleTarget<Bitmap>() {
@Override
public void onResourceReady(Bitmap resource, Transition<? super Bitmap> transition) {
if (getActivity() != null) {
if (getActivity() != null && avatarImageView != null) {
avatarImageView.setImageBitmap(TransformationUtils.circleCrop(GlideApp.get
(getActivity()).getBitmapPool(), resource, avatarSize, avatarSize));
}

31
app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.java
View file

@ -161,15 +161,17 @@ public class ConversationInfoController extends BaseController {
}
private void setupAdapter() {
if (adapter == null) {
if (adapter == null && getActivity() != null) {
adapter = new FlexibleAdapter<>(recyclerViewItems, getActivity(), true);
}
SmoothScrollLinearLayoutManager layoutManager =
new SmoothScrollLinearLayoutManager(getActivity());
recyclerView.setLayoutManager(layoutManager);
recyclerView.setHasFixedSize(true);
recyclerView.setAdapter(adapter);
if (recyclerView != null && getActivity() != null) {
SmoothScrollLinearLayoutManager layoutManager =
new SmoothScrollLinearLayoutManager(getActivity());
recyclerView.setLayoutManager(layoutManager);
recyclerView.setHasFixedSize(true);
recyclerView.setAdapter(adapter);
}
}
private void handleParticipants(List<Participant> participants) {
@ -260,13 +262,22 @@ public class ConversationInfoController extends BaseController {
progressBar.setVisibility(View.GONE);
}
nameCategoryView.setVisibility(View.VISIBLE);
conversationDisplayName.setText(conversation.getDisplayName());
if (nameCategoryView != null) {
nameCategoryView.setVisibility(View.VISIBLE);
}
if (conversationDisplayName != null) {
conversationDisplayName.setText(conversation.getDisplayName());
}
loadConversationAvatar();
if (conversationUser.hasSpreedCapabilityWithName("notification-levels")) {
messageNotificationLevel.setEnabled(true);
messageNotificationLevel.setAlpha(1.0f);
if (messageNotificationLevel != null) {
messageNotificationLevel.setEnabled(true);
messageNotificationLevel.setAlpha(1.0f);
}
if (!conversation.getNotificationLevel().equals(Conversation.NotificationLevel.DEFAULT)) {
String stringValue;
switch (new EnumNotificationLevelConverter().convertToInt(conversation.getNotificationLevel())) {

12
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
View file

@ -616,13 +616,19 @@ public class SettingsController extends BaseController {
} else {
switch (newValue) {
case "HTTP":
proxyPortEditText.setValue("3128");
if (proxyPortEditText != null) {
proxyPortEditText.setValue("3128");
}
break;
case "DIRECT":
proxyPortEditText.setValue("8080");
if (proxyPortEditText != null) {
proxyPortEditText.setValue("8080");
}
break;
case "SOCKS":
proxyPortEditText.setValue("1080");
if (proxyPortEditText != null) {
proxyPortEditText.setValue("1080");
}
break;
default:
break;