From 14508971edc5baa59d6359de3125ac01c9c83a8c Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Wed, 18 Sep 2019 15:40:18 +1000
Subject: [PATCH] Fix app preview UI

---
 .../thoughtcrime/securesms/BaseActionBarActivity.java  |  9 +++++++++
 src/org/thoughtcrime/securesms/BaseActivity.java       | 10 ++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java b/src/org/thoughtcrime/securesms/BaseActionBarActivity.java
index 75d24ef5f2..9c741c33cb 100644
--- a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java
+++ b/src/org/thoughtcrime/securesms/BaseActionBarActivity.java
@@ -1,8 +1,11 @@
 package org.thoughtcrime.securesms;
 
 import android.annotation.TargetApi;
+import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
@@ -22,6 +25,8 @@ import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWra
 
 import java.lang.reflect.Field;
 
+import network.loki.messenger.R;
+
 
 public abstract class BaseActionBarActivity extends AppCompatActivity {
   private static final String TAG = BaseActionBarActivity.class.getSimpleName();
@@ -39,6 +44,10 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
     super.onResume();
     initializeScreenshotSecurity();
     DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getLanguage(this));
+    String name = getResources().getString(R.string.app_name);
+    Bitmap icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_launcher_foreground);
+    int color = getResources().getColor(R.color.loki_darkest_gray);
+    setTaskDescription(new ActivityManager.TaskDescription(name, icon, color));
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/BaseActivity.java b/src/org/thoughtcrime/securesms/BaseActivity.java
index 9c5b11a207..f1999681bd 100644
--- a/src/org/thoughtcrime/securesms/BaseActivity.java
+++ b/src/org/thoughtcrime/securesms/BaseActivity.java
@@ -42,12 +42,10 @@ public abstract class BaseActivity extends FragmentActivity {
   protected void onResume() {
     super.onResume();
     DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getLanguage(this));
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      String name = getResources().getString(R.string.app_name);
-      Bitmap icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_launcher_foreground);
-      int color = getResources().getColor(R.color.loki_darkest_gray);
-      setTaskDescription(new ActivityManager.TaskDescription(name, icon, color));
-    }
+    String name = getResources().getString(R.string.app_name);
+    Bitmap icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_launcher_foreground);
+    int color = getResources().getColor(R.color.loki_darkest_gray);
+    setTaskDescription(new ActivityManager.TaskDescription(name, icon, color));
   }
 
   @Override