Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c76f9246 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch 'hotfix/crash-while-rotating-on-launcher' into 'master' 

Fix: Crash when exiting app while rotating the device

See merge request e/apps/BlissLauncher!31
parents 765a35f9 08052f12

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ build/ 
.idea/tasks.xml

.idea/modules.xml

.idea/assetWizardSettings.xml

.idea/markdown-navigator*

projectFilesBackup/



gradle.xml



.classpath

.idea/codeStyles/Project.xml

+0 −3
Original line number Diff line number Diff line
@@ -12,9 +12,6 @@ 
      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />

      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />

    </JetCodeStyleSettings>

    <MarkdownNavigatorCodeStyleSettings>

      <option name="RIGHT_MARGIN" value="72" />

    </MarkdownNavigatorCodeStyleSettings>

    <XML>

      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />

    </XML>

app/src/main/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"

            android:launchMode="singleTask"

            android:resumeWhilePausing="true"

            android:screenOrientation="nosensor"

            android:screenOrientation="portrait"

            android:stateNotNeeded="true"

            android:theme="@style/HomeScreenTheme"

            android:windowSoftInputMode="adjustPan">

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

+8 −4
Original line number Diff line number Diff line
@@ -50,8 +50,9 @@ class ShaderBlurDrawable internal constructor(private val blurWallpaperProvider: 
            blurBitmap = blurWallpaperProvider.placeholder

        }

        blurBitmap =

            if (blurBitmap!!.height > (blurBounds.bottom.toInt() - blurBounds.top.toInt())) {



            if (blurBitmap!!.height >= blurBounds.bottom &&

                blurBitmap!!.width >= blurBounds.right

            ) {

                Bitmap.createBitmap(

                    blurBitmap!!,

                    blurBounds.left.toInt(), blurBounds.top.toInt(),
@@ -91,8 +92,11 @@ class ShaderBlurDrawable internal constructor(private val blurWallpaperProvider: 


        blurPath.reset()

        blurPath.addRect(

            0f, 0f,

            blurBounds.right - blurBounds.left, blurBounds.bottom - blurBounds.top, Path.Direction.CW

            0f,

            0f,

            blurBounds.right - blurBounds.left,

            blurBounds.bottom - blurBounds.top,

            Path.Direction.CW

        )

    }

app/src/main/java/foundation/e/blisslauncher/core/broadcast/PackageAddedRemovedHandler.java

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public class PackageAddedRemovedHandler extends BroadcastReceiver { 


            AppAddEvent event = new AppAddEvent(packageName, user);

            EventRelay.getInstance().push(event);

            BlissLauncher.getApplication(ctx).getAppProvider().reload();

            BlissLauncher.getApplication(ctx).getAppProvider().reload(false);

        }



        if ("android.intent.action.PACKAGE_CHANGED".equalsIgnoreCase(action)) {
@@ -49,12 +49,12 @@ public class PackageAddedRemovedHandler extends BroadcastReceiver { 


            AppChangeEvent event = new AppChangeEvent(packageName, user);

            EventRelay.getInstance().push(event);

            BlissLauncher.getApplication(ctx).getAppProvider().reload();

            BlissLauncher.getApplication(ctx).getAppProvider().reload(false);

        }

        if ("android.intent.action.PACKAGE_REMOVED".equals(action) && !replacing) {

            AppRemoveEvent event = new AppRemoveEvent(packageName, user);

            EventRelay.getInstance().push(event);

            BlissLauncher.getApplication(ctx).getAppProvider().reload();

            BlissLauncher.getApplication(ctx).getAppProvider().reload(false);

        }



        if("android.intent.action.MEDIA_MOUNTED".equals(action)) {