5 files changed, 7 insertions, 7 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/util/BackgroundTask.java b/app/src/main/java/net/lacolaco/smileessence/util/BackgroundTask.java
index fce3470e..8ddfca88 100644
--- a/app/src/main/java/net/lacolaco/smileessence/util/BackgroundTask.java
+++ b/app/src/main/java/net/lacolaco/smileessence/util/BackgroundTask.java
@@ -28,10 +28,15 @@ public abstract class BackgroundTask<Result, Progress> extends AsyncTask<Void, P
         return cancel(true);
     }
 
+    public final BackgroundTask<Result, Progress> execute() {
+        super.execute();
+        return this;
+    }
+
     @Override
     protected final void onProgressUpdate(Progress... values) {
         for (Progress value : values) {
-            if (!isCancelled()) {
+            if (!isCancelled() && progress != null) {
                 progress.accept(value);
             }
         }
@@ -39,7 +44,7 @@ public abstract class BackgroundTask<Result, Progress> extends AsyncTask<Void, P
 
     @Override
     protected final void onPostExecute(Result result) {
-        if (!isCancelled()) {
+        if (!isCancelled() && then != null) {
             then.accept(result);
         }
     }
diff --git a/app/src/main/java/net/lacolaco/smileessence/util/BitmapOptimizer.java b/app/src/main/java/net/lacolaco/smileessence/util/BitmapOptimizer.java
index 850d1f8d..dbb6fccd 100644
--- a/app/src/main/java/net/lacolaco/smileessence/util/BitmapOptimizer.java
+++ b/app/src/main/java/net/lacolaco/smileessence/util/BitmapOptimizer.java
@@ -30,7 +30,6 @@ import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
 import android.media.ExifInterface;
 import android.os.Environment;
-
 import net.lacolaco.smileessence.logging.Logger;
 
 import java.io.File;
diff --git a/app/src/main/java/net/lacolaco/smileessence/util/Function.java b/app/src/main/java/net/lacolaco/smileessence/util/Function.java
index 82ea8c03..a4c60899 100644
--- a/app/src/main/java/net/lacolaco/smileessence/util/Function.java
+++ b/app/src/main/java/net/lacolaco/smileessence/util/Function.java
@@ -1,7 +1,5 @@
 package net.lacolaco.smileessence.util;
 
-import java.util.Objects;
-
 public interface Function<T, R> {
     R apply(T t);
     /*default <V> Function<V, R> compose(Function<? super V, ? extends T> before) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/util/IntentUtils.java b/app/src/main/java/net/lacolaco/smileessence/util/IntentUtils.java
index 567939d5..4075c41a 100644
--- a/app/src/main/java/net/lacolaco/smileessence/util/IntentUtils.java
+++ b/app/src/main/java/net/lacolaco/smileessence/util/IntentUtils.java
@@ -28,7 +28,6 @@ import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-
 import net.lacolaco.smileessence.R;
 import net.lacolaco.smileessence.notification.NotificationType;
 import net.lacolaco.smileessence.notification.Notificator;
diff --git a/app/src/main/java/net/lacolaco/smileessence/util/Themes.java b/app/src/main/java/net/lacolaco/smileessence/util/Themes.java
index de608060..60ed9506 100644
--- a/app/src/main/java/net/lacolaco/smileessence/util/Themes.java
+++ b/app/src/main/java/net/lacolaco/smileessence/util/Themes.java
@@ -27,7 +27,6 @@ package net.lacolaco.smileessence.util;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-
 import net.lacolaco.smileessence.R;
 import net.lacolaco.smileessence.logging.Logger;