gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases 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>() { .into(new SimpleTarget<Bitmap>() {
@Override @Override
public void onResourceReady(Bitmap resource, Transition<? super Bitmap> transition) { public void onResourceReady(Bitmap resource, Transition<? super Bitmap> transition) {
if (getActivity() != null) { if (getActivity() != null && avatarImageView != null) {
avatarImageView.setImageBitmap(TransformationUtils.circleCrop(GlideApp.get avatarImageView.setImageBitmap(TransformationUtils.circleCrop(GlideApp.get
(getActivity()).getBitmapPool(), resource, avatarSize, avatarSize)); (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() { private void setupAdapter() {
if (adapter == null) { if (adapter == null && getActivity() != null) {
adapter = new FlexibleAdapter<>(recyclerViewItems, getActivity(), true); adapter = new FlexibleAdapter<>(recyclerViewItems, getActivity(), true);
} }
SmoothScrollLinearLayoutManager layoutManager = if (recyclerView != null && getActivity() != null) {
new SmoothScrollLinearLayoutManager(getActivity()); SmoothScrollLinearLayoutManager layoutManager =
recyclerView.setLayoutManager(layoutManager); new SmoothScrollLinearLayoutManager(getActivity());
recyclerView.setHasFixedSize(true); recyclerView.setLayoutManager(layoutManager);
recyclerView.setAdapter(adapter); recyclerView.setHasFixedSize(true);
recyclerView.setAdapter(adapter);
}
} }
private void handleParticipants(List<Participant> participants) { private void handleParticipants(List<Participant> participants) {
@ -260,13 +262,22 @@ public class ConversationInfoController extends BaseController {
progressBar.setVisibility(View.GONE); progressBar.setVisibility(View.GONE);
} }
nameCategoryView.setVisibility(View.VISIBLE); if (nameCategoryView != null) {
conversationDisplayName.setText(conversation.getDisplayName()); nameCategoryView.setVisibility(View.VISIBLE);
}
if (conversationDisplayName != null) {
conversationDisplayName.setText(conversation.getDisplayName());
}
loadConversationAvatar(); loadConversationAvatar();
if (conversationUser.hasSpreedCapabilityWithName("notification-levels")) { if (conversationUser.hasSpreedCapabilityWithName("notification-levels")) {
messageNotificationLevel.setEnabled(true); if (messageNotificationLevel != null) {
messageNotificationLevel.setAlpha(1.0f); messageNotificationLevel.setEnabled(true);
messageNotificationLevel.setAlpha(1.0f);
}
if (!conversation.getNotificationLevel().equals(Conversation.NotificationLevel.DEFAULT)) { if (!conversation.getNotificationLevel().equals(Conversation.NotificationLevel.DEFAULT)) {
String stringValue; String stringValue;
switch (new EnumNotificationLevelConverter().convertToInt(conversation.getNotificationLevel())) { 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 { } else {
switch (newValue) { switch (newValue) {
case "HTTP": case "HTTP":
proxyPortEditText.setValue("3128"); if (proxyPortEditText != null) {
proxyPortEditText.setValue("3128");
}
break; break;
case "DIRECT": case "DIRECT":
proxyPortEditText.setValue("8080"); if (proxyPortEditText != null) {
proxyPortEditText.setValue("8080");
}
break; break;
case "SOCKS": case "SOCKS":
proxyPortEditText.setValue("1080"); if (proxyPortEditText != null) {
proxyPortEditText.setValue("1080");
}
break; break;
default: default:
break; break;