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

Fix an issue with loading background due to etags usage

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-04-28 11:18:26 +02:00
parent 7621081449
commit 4d0fa0927b
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java
View File

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

1
app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperation.java
View File

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

45
app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
View File

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