From 6c1ec0069384f18321da5e111aacd4d94ada7a39 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Fri, 10 Aug 2018 01:37:47 +0200
Subject: [PATCH] Small fixes

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../CallNotificationController.java           | 35 ++++++++++---------
 .../drawable/ic_people_group_black_24px.xml   | 27 --------------
 2 files changed, 18 insertions(+), 44 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_people_group_black_24px.xml

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
index edb0f9065..b8b5d0b68 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
@@ -420,25 +420,26 @@ public class CallNotificationController extends BaseController {
                                             (getActivity()).getBitmapPool(), resource, avatarSize, avatarSize));
                                 }
 
-                                if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 200) {
-                                    final Allocation input = Allocation.createFromBitmap(renderScript, resource);
-                                    final Allocation output = Allocation.createTyped(renderScript, input.getType());
-                                    final ScriptIntrinsicBlur script = ScriptIntrinsicBlur.create(renderScript, Element
-                                            .U8_4(renderScript));
-                                    script.setRadius(15f);
-                                    script.setInput(input);
-                                    script.forEach(output);
-                                    output.copyTo(resource);
+                                    if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 200 &&
+                                            userBeingCalled.hasSpreedCapabilityWithName("no-ping")) {
+                                        final Allocation input = Allocation.createFromBitmap(renderScript, resource);
+                                        final Allocation output = Allocation.createTyped(renderScript, input.getType());
+                                        final ScriptIntrinsicBlur script = ScriptIntrinsicBlur.create(renderScript, Element
+                                                .U8_4(renderScript));
+                                        script.setRadius(15f);
+                                        script.setInput(input);
+                                        script.forEach(output);
+                                        output.copyTo(resource);
 
-                                    incomingTextRelativeLayout.setBackground(getResources().getDrawable(R.drawable
-                                            .incoming_gradient));
-                                    constraintLayout.setBackground(new BitmapDrawable(resource));
-                                } else if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 201) {
-                                    Palette palette = Palette.from(resource).generate();
-                                    constraintLayout.setBackgroundColor(palette.getDominantColor(
-                                            getResources().getColor(R.color.grey950)));
+                                        incomingTextRelativeLayout.setBackground(getResources().getDrawable(R.drawable
+                                                .incoming_gradient));
+                                        constraintLayout.setBackground(new BitmapDrawable(resource));
+                                    } else if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 201) {
+                                        Palette palette = Palette.from(resource).generate();
+                                        constraintLayout.setBackgroundColor(palette.getDominantColor(
+                                                getResources().getColor(R.color.grey950)));
+                                    }
                                 }
-                            }
                         });
 
 
diff --git a/app/src/main/res/drawable/ic_people_group_black_24px.xml b/app/src/main/res/drawable/ic_people_group_black_24px.xml
deleted file mode 100644
index 8d90bfb67..000000000
--- a/app/src/main/res/drawable/ic_people_group_black_24px.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-  ~ Nextcloud Talk application
-  ~
-  ~ @author Mario Danic
-  ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFF" android:fillType="nonZero"
-        android:pathData="M12.729,5C11.044,5 9.833,6.38 9.833,7.702C9.833,9.054 9.93,10.019 10.605,11.08C10.822,11.36 11.074,11.418 11.281,11.659C11.411,12.142 11.513,12.625 11.378,13.107C10.957,13.255 10.557,13.428 10.152,13.59C9.66,13.326 9.09,13.107 8.598,12.914C8.53,12.644 8.579,12.444 8.646,12.19C8.762,12.07 8.868,12.016 8.994,11.901C9.351,11.466 9.37,10.733 9.37,10.212C9.37,9.44 8.675,8.861 7.922,8.861C7.082,8.861 6.474,9.555 6.474,10.212L6.455,10.212C6.455,10.887 6.503,11.37 6.841,11.901C6.938,12.045 7.075,12.07 7.179,12.19C7.244,12.431 7.296,12.673 7.227,12.914C6.61,13.129 6.027,13.397 5.49,13.686C5.085,13.976 5.265,13.862 5.007,14.796C4.888,15.279 6.262,15.501 7.247,15.578C7.198,15.843 7.131,16.196 6.938,16.871C6.629,18.078 11.139,18.512 12.729,18.512C15.074,18.512 18.822,18.072 18.501,16.871C17.999,14.999 18.3,15.221 17.555,14.651C16.503,14.02 15.188,13.525 14.08,13.107C13.935,12.57 14.041,12.171 14.177,11.659C14.403,11.418 14.659,11.312 14.872,11.08C15.537,10.227 15.624,8.741 15.624,7.702C15.624,6.172 14.244,5 12.729,5L12.729,5Z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-</vector>