浏览代码

Fix an issue with loading background due to etags usage

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 6 年之前
父节点
当前提交
4d0fa0927b

+ 1 - 1
app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java

@@ -117,7 +117,7 @@ public class CallItem extends AbstractFlexibleItem<CallItem.RoomItemViewHolder>
         } else {
             holder.passwordProtectedImageView.setVisibility(View.GONE);
         }
-        
+
         Resources resources = NextcloudTalkApplication.getSharedApplication().getResources();
         switch (conversation.getType()) {
             case ROOM_TYPE_ONE_TO_ONE_CALL:

+ 0 - 1
app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperation.java

@@ -85,7 +85,6 @@ public class ReadFilesystemOperation {
             e.printStackTrace();
         }
 
-
         remoteFiles.add(BrowserFile.getModelFromResponse(rootElement[0],
                 rootElement[0].getHref().toString().substring(basePath.length())));
         for (Response memberElement : memberElements) {

+ 23 - 22
app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java

@@ -413,37 +413,38 @@ public class CallNotificationController extends BaseController {
                 dataSource.subscribe(new BaseBitmapDataSubscriber() {
                     @Override
                     protected void onNewResultImpl(@Nullable Bitmap bitmap) {
-                        avatarImageView.getHierarchy().setImage(new BitmapDrawable(bitmap), 100,
-                                true);
+                        if (avatarImageView != null) {
+                            avatarImageView.getHierarchy().setImage(new BitmapDrawable(bitmap), 100,
+                                    true);
 
-                        if (getResources() != null) {
-                            incomingTextRelativeLayout.setBackground(getResources().getDrawable(R.drawable
-                                    .incoming_gradient));
-                        }
-
-                        if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 200 &&
-                                userBeingCalled.hasSpreedCapabilityWithName("no-ping")) {
-                            if (getActivity() != null) {
-                                Bitmap backgroundBitmap = bitmap.copy(bitmap.getConfig(), true);
-                                new BlurPostProcessor(5, getActivity()).process(backgroundBitmap);
-                                backgroundImageView.setImageDrawable(new BitmapDrawable(backgroundBitmap));
+                            if (getResources() != null) {
+                                incomingTextRelativeLayout.setBackground(getResources().getDrawable(R.drawable
+                                        .incoming_gradient));
                             }
-                        } else if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 201) {
-                            ColorArt colorArt = new ColorArt(bitmap);
-                            int color = colorArt.getBackgroundColor();
 
-                            float[] hsv = new float[3];
-                            Color.colorToHSV(color, hsv);
-                            hsv[2] *= 0.75f;
-                            color = Color.HSVToColor(hsv);
+                            if ((AvatarStatusCodeHolder.getInstance().getStatusCode() == 200 || AvatarStatusCodeHolder.getInstance().getStatusCode() == 0) &&
+                                    userBeingCalled.hasSpreedCapabilityWithName("no-ping")) {
+                                if (getActivity() != null) {
+                                    Bitmap backgroundBitmap = bitmap.copy(bitmap.getConfig(), true);
+                                    new BlurPostProcessor(5, getActivity()).process(backgroundBitmap);
+                                    backgroundImageView.setImageDrawable(new BitmapDrawable(backgroundBitmap));
+                                }
+                            } else if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 201) {
+                                ColorArt colorArt = new ColorArt(bitmap);
+                                int color = colorArt.getBackgroundColor();
 
-                            backgroundImageView.setImageDrawable(new ColorDrawable(color));
+                                float[] hsv = new float[3];
+                                Color.colorToHSV(color, hsv);
+                                hsv[2] *= 0.75f;
+                                color = Color.HSVToColor(hsv);
+
+                                backgroundImageView.setImageDrawable(new ColorDrawable(color));
+                            }
                         }
                     }
 
                     @Override
                     protected void onFailureImpl(DataSource<CloseableReference<CloseableImage>> dataSource) {
-
                     }
                 }, UiThreadImmediateExecutorService.getInstance());