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

Fix things

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-08-23 13:37:47 +02:00
parent e514c24316
commit 48ff5247b0
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ package com.nextcloud.talk.controllers;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.media.AudioAttributes; import android.media.AudioAttributes;
import android.media.MediaPlayer; import android.media.MediaPlayer;
@ -441,8 +442,16 @@ public class CallNotificationController extends BaseController {
constraintLayout.setBackground(new BitmapDrawable(resource)); constraintLayout.setBackground(new BitmapDrawable(resource));
} else if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 201) { } else if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 201) {
Palette palette = Palette.from(resource).generate(); Palette palette = Palette.from(resource).generate();
constraintLayout.setBackgroundColor(palette.getDominantColor( int color = palette.getDominantColor(getResources().getColor(R.color.grey950));
getResources().getColor(R.color.grey950)));
if (color != getResources().getColor(R.color.grey950)) {
float[] hsv = new float[3];
Color.colorToHSV(color, hsv);
hsv[2] *= 0.75f;
color = Color.HSVToColor(hsv);
}
constraintLayout.setBackgroundColor(color);
} }
} }
}); });

2
app/src/main/java/com/nextcloud/talk/utils/PushUtils.java
View File

@ -266,7 +266,7 @@ public class PushUtils {
ncApi.registerDeviceForNotificationsWithNextcloud( ncApi.registerDeviceForNotificationsWithNextcloud(
credentials, credentials,
ApiUtils.getUrlNextcloudPush(userEntity.getBaseUrl()), queryMap) ApiUtils.getUrlNextcloudPush(userEntity.getBaseUrl()), queryMap)
.blockingSubscribe(new Observer<PushRegistrationOverall>() { .subscribe(new Observer<PushRegistrationOverall>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(Disposable d) {