Fix storage permission issue and create placeholder before-hand to prevent NPE (adeae52f) · Commits · e / os / BlissLauncher

app/src/main/java/foundation/e/blisslauncher/core/blur/BlurWallpaperFilter.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -12,7 +12,7 @@ class BlurWallpaperFilter(private val context: Context) : WallpaperFilter {
	override fun apply(wallpaper: Bitmap): WallpaperFilter.ApplyTask {		override fun apply(wallpaper: Bitmap): WallpaperFilter.ApplyTask {
	return WallpaperFilter.ApplyTask.create { emitter ->		return WallpaperFilter.ApplyTask.create { emitter ->
	HokoBlur.with(context)		HokoBlur.with(context)
	.scheme(HokoBlur.SCHEME_RENDER_SCRIPT)		.scheme(HokoBlur.SCHEME_OPENGL)
	.mode(HokoBlur.MODE_STACK)		.mode(HokoBlur.MODE_STACK)
	.radius(blurRadius)		.radius(blurRadius)
	.sampleFactor(8f)		.sampleFactor(8f)

app/src/main/java/foundation/e/blisslauncher/core/blur/BlurWallpaperProvider.kt

+18 −19

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,6 @@ import android.graphics.Canvas
	import android.graphics.ColorMatrix		import android.graphics.ColorMatrix
	import android.graphics.ColorMatrixColorFilter		import android.graphics.ColorMatrixColorFilter
	import android.graphics.Paint		import android.graphics.Paint
	import android.os.Build
	import android.support.v4.app.ActivityCompat		import android.support.v4.app.ActivityCompat
	import android.util.DisplayMetrics		import android.util.DisplayMetrics
	import android.util.Log		import android.util.Log
	@@ -71,7 +70,17 @@ class BlurWallpaperProvider(val context: Context) {
	return		return
	}		}

	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {		// Prepare a placeholder before hand so that it can be used in case wallpaper is null
			val wm =
			context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
			val display = wm.defaultDisplay
			display.getRealMetrics(displayMetrics)
			val width = displayMetrics.widthPixels
			val height = displayMetrics.heightPixels
			placeholder = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
			val canvas = Canvas(placeholder!!)
			canvas.drawColor(0x44000000)

	if (ActivityCompat.checkSelfPermission(		if (ActivityCompat.checkSelfPermission(
	context,		context,
	Manifest.permission.READ_EXTERNAL_STORAGE		Manifest.permission.READ_EXTERNAL_STORAGE
	@@ -80,7 +89,6 @@ class BlurWallpaperProvider(val context: Context) {
	Log.d("BWP", "NO permission granted")		Log.d("BWP", "NO permission granted")
	return		return
	}		}
	}

	val enabled = getEnabledStatus()		val enabled = getEnabledStatus()
	if (enabled != isEnabled) {		if (enabled != isEnabled) {
	@@ -92,15 +100,6 @@ class BlurWallpaperProvider(val context: Context) {

	if (!isEnabled) {		if (!isEnabled) {
	wallpaper = null		wallpaper = null
	val wm =
	context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
	val display = wm.defaultDisplay
	display.getRealMetrics(displayMetrics)
	val width = displayMetrics.widthPixels
	val height = displayMetrics.heightPixels
	placeholder = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
	val canvas = Canvas(placeholder!!)
	canvas.drawColor(0x44000000)
	return		return
	}		}

app/src/main/java/foundation/e/blisslauncher/core/utils/blur/BlurUtils.java

deleted100644 → 0

+0 −399

Original line number	Original line	Diff line number	Diff line
	package foundation.e.blisslauncher.core.utils.blur;

	import android.content.Context;
	import android.graphics.Bitmap;
	import android.renderscript.Allocation;
	import android.renderscript.Element;
	import android.renderscript.RenderScript;
	import android.renderscript.ScriptIntrinsicBlur;

	public class BlurUtils {

	private Context mContext;
	private RenderScript mRenderScript;
	private ScriptIntrinsicBlur mScriptIntrinsicBlur;

	// enum
	public enum BlurEngine {
	RenderScriptBlur,
	StackBlur,
	FastBlur
	}

	// interface
	public interface BlurTaskCallback {
	void blurTaskDone(Bitmap blurredBitmap);
	void dominantColor(int color);
	}

	public BlurUtils(Context context) {
	mContext = context;
	mRenderScript = RenderScript.create(mContext);
	mScriptIntrinsicBlur = ScriptIntrinsicBlur.create(mRenderScript, Element.U8_4 (mRenderScript));
	}

	public Context getContext() {
	return mContext;
	}

	public Bitmap renderScriptBlur(Bitmap bitmap, int radius) {

	if (mRenderScript == null)
	return null;

	Allocation input = Allocation.createFromBitmap(mRenderScript, bitmap);
	Allocation output = Allocation.createTyped(mRenderScript, input.getType());
	mScriptIntrinsicBlur.setRadius(radius);
	mScriptIntrinsicBlur.setInput(input);
	mScriptIntrinsicBlur.forEach(output);
	output.copyTo(bitmap);

	return bitmap;

	}

	public Bitmap stackBlur(Bitmap bitmap, int radius) {

	// raio válido ?
	if (radius < 1)
	return null;

	int w = bitmap.getWidth();
	int h = bitmap.getHeight();

	int[] pix = new int[w * h];
	bitmap.getPixels(pix, 0, w, 0, 0, w, h);

	int wm = w - 1;
	int hm = h - 1;
	int wh = w * h;
	int div = radius + radius + 1;

	int r[] = new int[wh];
	int g[] = new int[wh];
	int b[] = new int[wh];
	int rsum, gsum, bsum, x, y, i, p, yp, yi, yw;
	int vmin[] = new int[Math.max(w, h)];

	int divsum = (div + 1) >> 1;
	divsum *= divsum;
	int dv[] = new int[256 * divsum];

	for (i = 0; i < 256 * divsum; i++) {

	dv[i] = (i / divsum);

	}

	yw = yi = 0;

	int[][] stack = new int[div][3];
	int stackpointer;
	int stackstart;
	int[] sir;
	int rbs;
	int r1 = radius + 1;
	int routsum, goutsum, boutsum;
	int rinsum, ginsum, binsum;

	for (y = 0; y < h; y++) {

	rinsum = ginsum = binsum = routsum = goutsum = boutsum = rsum = gsum = bsum = 0;
	for (i = -radius; i <= radius; i++) {

	p = pix[yi + Math.min(wm, Math.max(i, 0))];
	sir = stack[i + radius];
	sir[0] = (p & 0xff0000) >> 16;
	sir[1] = (p & 0x00ff00) >> 8;
	sir[2] = (p & 0x0000ff);
	rbs = r1 - Math.abs(i);
	rsum += sir[0] * rbs;
	gsum += sir[1] * rbs;
	bsum += sir[2] * rbs;

	if (i > 0) {

	rinsum += sir[0];
	ginsum += sir[1];
	binsum += sir[2];

	} else {

	routsum += sir[0];
	goutsum += sir[1];
	boutsum += sir[2];

	}
	}

	stackpointer = radius;

	for (x = 0; x < w; x++) {

	r[yi] = dv[rsum];
	g[yi] = dv[gsum];
	b[yi] = dv[bsum];

	rsum -= routsum;
	gsum -= goutsum;
	bsum -= boutsum;

	stackstart = stackpointer - radius + div;
	sir = stack[stackstart % div];

	routsum -= sir[0];
	goutsum -= sir[1];
	boutsum -= sir[2];

	if (y == 0) {

	vmin[x] = Math.min(x + radius + 1, wm);

	}

	p = pix[yw + vmin[x]];

	sir[0] = (p & 0xff0000) >> 16;
	sir[1] = (p & 0x00ff00) >> 8;
	sir[2] = (p & 0x0000ff);

	rinsum += sir[0];
	ginsum += sir[1];
	binsum += sir[2];

	rsum += rinsum;
	gsum += ginsum;
	bsum += binsum;

	stackpointer = (stackpointer + 1) % div;
	sir = stack[(stackpointer) % div];

	routsum += sir[0];
	goutsum += sir[1];
	boutsum += sir[2];

	rinsum -= sir[0];
	ginsum -= sir[1];
	binsum -= sir[2];

	yi++;

	}

	yw += w;

	}

	for (x = 0; x < w; x++) {

	rinsum = ginsum = binsum = routsum = goutsum = boutsum = rsum = gsum = bsum = 0;
	yp = -radius * w;

	for (i = -radius; i <= radius; i++) {

	yi = Math.max(0, yp) + x;

	sir = stack[i + radius];

	sir[0] = r[yi];
	sir[1] = g[yi];
	sir[2] = b[yi];

	rbs = r1 - Math.abs(i);

	rsum += r[yi] * rbs;
	gsum += g[yi] * rbs;
	bsum += b[yi] * rbs;

	if (i > 0) {

	rinsum += sir[0];
	ginsum += sir[1];
	binsum += sir[2];

	} else {

	routsum += sir[0];
	goutsum += sir[1];
	boutsum += sir[2];

	}

	if (i < hm) {

	yp += w;

	}
	}

	yi = x;
	stackpointer = radius;

	for (y = 0; y < h; y++) {

	pix[yi] = (0xff000000 & pix[yi]) \| (dv[rsum] << 16) \| (dv[gsum] << 8) \| dv[bsum];

	rsum -= routsum;
	gsum -= goutsum;
	bsum -= boutsum;

	stackstart = stackpointer - radius + div;
	sir = stack[stackstart % div];

	routsum -= sir[0];
	goutsum -= sir[1];
	boutsum -= sir[2];

	if (x == 0) {

	vmin[y] = Math.min(y + r1, hm) * w;

	}

	p = x + vmin[y];

	sir[0] = r[p];
	sir[1] = g[p];
	sir[2] = b[p];

	rinsum += sir[0];
	ginsum += sir[1];
	binsum += sir[2];

	rsum += rinsum;
	gsum += ginsum;
	bsum += binsum;

	stackpointer = (stackpointer + 1) % div;
	sir = stack[stackpointer];

	routsum += sir[0];
	goutsum += sir[1];
	boutsum += sir[2];

	rinsum -= sir[0];
	ginsum -= sir[1];
	binsum -= sir[2];

	yi += w;

	}
	}

	bitmap.setPixels(pix, 0, w, 0, 0, w, h);

	return bitmap;

	}

	public void fastBlur(Bitmap bitmap, int radius){

	if (radius < 1)
	return;

	int w = bitmap.getWidth();
	int h = bitmap.getHeight();
	int wm = w - 1;
	int hm = h - 1;
	int wh = w * h;
	int div = radius + radius + 1;
	int r[] = new int[wh];
	int g[] = new int[wh];
	int b[] = new int[wh];
	int rsum, gsum, bsum, x, y, i, p, p1, p2, yp, yi, yw;
	int vmin[] = new int[Math.max(w, h)];
	int vmax[] = new int[Math.max(w, h)];
	int[] pix = new int[w * h];

	bitmap.getPixels(pix, 0, w, 0, 0, w, h);

	int dv[]=new int[256*div];

	for (i = 0; i < 256 * div; i++) {

	dv[i] = (i / div);

	}

	yw = yi = 0;

	for (y = 0; y < h; y++) {

	rsum = gsum = bsum = 0;
	for(i = -radius; i <= radius; i++) {

	p = pix[yi + Math.min(wm, Math.max(i, 0))];
	rsum += (p & 0xff0000) >> 16;
	gsum += (p & 0x00ff00) >> 8;
	bsum += p & 0x0000ff;

	}

	for (x = 0; x < w; x++) {

	r[yi]=dv[rsum];
	g[yi]=dv[gsum];
	b[yi]=dv[bsum];

	if (y == 0) {

	vmin[x] = Math.min(x + radius + 1,wm);
	vmax[x] = Math.max(x - radius, 0);

	}

	p1 = pix[yw + vmin[x]];
	p2 = pix[yw + vmax[x]];

	rsum += ((p1 & 0xff0000) - (p2 & 0xff0000)) >> 16;
	gsum += ((p1 & 0x00ff00) - (p2 & 0x00ff00)) >> 8;
	bsum += (p1 & 0x0000ff) - (p2 & 0x0000ff);
	yi++;

	}

	yw += w;

	}

	for (x = 0; x < w; x++) {

	rsum = gsum = bsum = 0;
	yp =- radius * w;
	for (i =- radius; i <= radius; i++) {

	yi = Math.max(0, yp) + x;
	rsum += r[yi];
	gsum += g[yi];
	bsum +=b [yi];
	yp += w;

	}

	yi=x;
	for (y = 0; y < h; y++) {

	pix[yi] = 0xff000000 \| (dv[rsum] << 16) \| (dv[gsum] << 8) \| dv[bsum];
	if (x == 0){

	vmin[y] = Math.min(y + radius + 1,hm) * w;
	vmax[y] = Math.max(y - radius, 0) * w;

	}

	p1 = x + vmin[y];
	p2 = x + vmax[y];

	rsum += r[p1] -r[p2];
	gsum += g[p1] -g[p2];
	bsum += b[p1] -b[p2];

	yi+=w;

	}
	}

	bitmap.setPixels(pix, 0, w, 0, 0, w, h);

	}
	}

app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -88,6 +88,7 @@ import foundation.e.blisslauncher.core.Alarm;
	import foundation.e.blisslauncher.core.DeviceProfile;		import foundation.e.blisslauncher.core.DeviceProfile;
	import foundation.e.blisslauncher.core.Preferences;		import foundation.e.blisslauncher.core.Preferences;
	import foundation.e.blisslauncher.core.Utilities;		import foundation.e.blisslauncher.core.Utilities;
			import foundation.e.blisslauncher.core.blur.BlurWallpaperProvider;
	import foundation.e.blisslauncher.core.broadcast.ManagedProfileBroadcastReceiver;		import foundation.e.blisslauncher.core.broadcast.ManagedProfileBroadcastReceiver;
	import foundation.e.blisslauncher.core.broadcast.TimeChangeBroadcastReceiver;		import foundation.e.blisslauncher.core.broadcast.TimeChangeBroadcastReceiver;
	import foundation.e.blisslauncher.core.broadcast.WallpaperChangeReceiver;		import foundation.e.blisslauncher.core.broadcast.WallpaperChangeReceiver;
	@@ -1450,6 +1451,7 @@ public class LauncherActivity extends AppCompatActivity implements
	if (grantResults.length > 0		if (grantResults.length > 0
	&& grantResults[0] == PackageManager.PERMISSION_GRANTED) {		&& grantResults[0] == PackageManager.PERMISSION_GRANTED) {
	Log.d(TAG, "Storage permission granted");		Log.d(TAG, "Storage permission granted");
			BlurWallpaperProvider.Companion.getInstance(getApplicationContext()).updateAsync();
	}		}
	}		}
	}		}

app/src/main/res/drawable/folder_window.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3,7 +3,7 @@
	xmlns:android="http://schemas.android.com/apk/res/android"		xmlns:android="http://schemas.android.com/apk/res/android"
	android:shape="rectangle">		android:shape="rectangle">

	<solid android:color="@color/dark_grey"/>		<solid android:color="#88D3D3D3"/>
	<corners android:radius="15dp"/>		<corners android:radius="15dp"/>

	</shape>		</shape>
			No newline at end of file