From d501f17525e23478197a69832e59cf1f47d32127 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Fri, 8 Feb 2019 17:18:10 +0100
Subject: [PATCH 1/6] request permission to ask the user to ignore
 battery-optimize

---
 AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e35d020ee..eaf0d1b66 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -31,6 +31,7 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.SET_WALLPAPER"/>
     <uses-permission android:name="android.permission.RAISED_THREAD_PRIORITY" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 
     <application android:name=".ApplicationContext"
                  android:icon="@mipmap/ic_launcher"

From 4d6892b991362e96785b09f06e67beb8b34dd48f Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Fri, 8 Feb 2019 17:19:31 +0100
Subject: [PATCH 2/6] ask the the user to disable battery-optimize if eligible;
 check the system setting before adding the permanent notification

---
 .../securesms/ConversationListFragment.java   | 13 +++--
 .../securesms/LogViewFragment.java            | 22 ++++++---
 .../components/reminder/DozeReminder.java     | 47 ++++++++++++-------
 .../securesms/connect/KeepAliveService.java   | 13 +++++
 4 files changed, 67 insertions(+), 28 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index a5e778a5a..49cb885fc 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -58,6 +58,7 @@ import com.b44t.messenger.DcEventCenter;
 import org.thoughtcrime.securesms.ConversationListAdapter.ItemClickListener;
 import org.thoughtcrime.securesms.components.recyclerview.DeleteItemAnimator;
 import org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton;
+import org.thoughtcrime.securesms.components.reminder.DozeReminder;
 import org.thoughtcrime.securesms.components.reminder.Reminder;
 import org.thoughtcrime.securesms.components.reminder.ReminderView;
 import org.thoughtcrime.securesms.connect.ApplicationDcContext;
@@ -186,11 +187,13 @@ public class ConversationListFragment extends Fragment
 //          return Optional.of(new ExpiredBuildReminder(context));
 //        } else if (OutdatedBuildReminder.isEligible()) {
 //          return Optional.of(new OutdatedBuildReminder(context));
-//        } else if (DozeReminder.isEligible(context)) {
-//          return Optional.of(new DozeReminder(context));
-//        } else {
-          return Optional.absent();
-//        }
+//        } else
+          if (DozeReminder.isEligible(context)) {
+            return Optional.of(new DozeReminder(context));
+          }
+          else {
+            return Optional.absent();
+          }
       }
 
       @Override
diff --git a/src/org/thoughtcrime/securesms/LogViewFragment.java b/src/org/thoughtcrime/securesms/LogViewFragment.java
index 3d51a3460..cd67b41dc 100644
--- a/src/org/thoughtcrime/securesms/LogViewFragment.java
+++ b/src/org/thoughtcrime/securesms/LogViewFragment.java
@@ -26,6 +26,7 @@ import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
+import android.os.PowerManager;
 import android.support.v4.app.Fragment;
 import android.text.TextUtils;
 import android.util.Log;
@@ -160,21 +161,24 @@ public class LogViewFragment extends Fragment {
   }
 
   private static String buildDescription(Context context) {
+
+    PowerManager powerManager = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
     final PackageManager pm      = context.getPackageManager();
     final StringBuilder  builder = new StringBuilder();
 
 
-    builder.append("Device  : ")
+    builder.append("device=")
            .append(Build.MANUFACTURER).append(" ")
            .append(Build.MODEL).append(" (")
            .append(Build.PRODUCT).append(")\n");
-    builder.append("Android : ").append(VERSION.RELEASE).append(" (")
+    builder.append("android=").append(VERSION.RELEASE).append(" (")
                                .append(VERSION.INCREMENTAL).append(", ")
                                .append(Build.DISPLAY).append(")\n");
-    builder.append("Memory  : ").append(getMemoryUsage(context)).append("\n");
-    builder.append("Memclass: ").append(getMemoryClass(context)).append("\n");
-    builder.append("OS Host : ").append(Build.HOST).append("\n");
-    builder.append("App     : ");
+    builder.append("sdk=").append(Build.VERSION.SDK_INT).append("\n");
+    builder.append("memory=").append(getMemoryUsage(context)).append("\n");
+    builder.append("memoryClass=").append(getMemoryClass(context)).append("\n");
+    builder.append("host=").append(Build.HOST).append("\n");
+    builder.append("app=");
     try {
       builder.append(pm.getApplicationLabel(pm.getApplicationInfo(context.getPackageName(), 0)))
              .append(" ")
@@ -183,7 +187,11 @@ public class LogViewFragment extends Fragment {
              .append(BuildConfig.FLAVOR)
              .append(BuildConfig.DEBUG? "-debug" : "")
              .append("\n");
-    } catch (PackageManager.NameNotFoundException nnfe) {
+      if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        builder.append("ignoreBatteryOptimizations=").append(
+            powerManager.isIgnoringBatteryOptimizations(context.getPackageName())).append("\n");
+      }
+    } catch (Exception e) {
       builder.append("Unknown\n");
     }
 
diff --git a/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java b/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java
index 909465354..e0ab84452 100644
--- a/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java
+++ b/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java
@@ -1,15 +1,18 @@
 package org.thoughtcrime.securesms.components.reminder;
 
 
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.PowerManager;
 import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.annotation.RequiresApi;
+import android.support.v4.content.ContextCompat;
 import android.view.View;
 
 import org.thoughtcrime.securesms.R;
@@ -20,32 +23,44 @@ public class DozeReminder extends Reminder {
 
   @RequiresApi(api = Build.VERSION_CODES.M)
   public DozeReminder(@NonNull final Context context) {
-    super("R.string.DozeReminder_optimize_for_missing_play_services",
-          "R.string.DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery");
+    super("Tap here to receive messages while Delta Chat is in background.",
+          "Delta Chat uses minimal resources and takes care not to drain your battery.");
 
     setOkListener(v -> {
-      Prefs.setPromptedOptimizeDoze(context, true);
-      Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
-                                 Uri.parse("package:" + context.getPackageName()));
-      context.startActivity(intent);
+      if(ContextCompat.checkSelfPermission(context, Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)==PackageManager.PERMISSION_GRANTED) {
+        Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
+            Uri.parse("package:" + context.getPackageName()));
+        context.startActivity(intent);
+      }
+      else {
+        Intent intent = new Intent(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS);
+        context.startActivity(intent);
+      }
     });
 
-    setDismissListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View v) {
-        Prefs.setPromptedOptimizeDoze(context, true);
-      }
+    setDismissListener(v -> {
+      Prefs.  setPromptedOptimizeDoze(context, true);
     });
   }
 
   public static boolean isEligible(Context context) {
-    if(context!=null) { // condition is always true, disable reminder for now
+    if(context==null) {
       return false;
     }
 
-    return !Prefs.hasPromptedOptimizeDoze(context) &&
-           Build.VERSION.SDK_INT >= Build.VERSION_CODES.M          &&
-           !((PowerManager)context.getSystemService(Context.POWER_SERVICE)).isIgnoringBatteryOptimizations(context.getPackageName());
-  }
+    if(Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+      return false;
+    }
 
+    if(Prefs.hasPromptedOptimizeDoze(context)) {
+      return false;
+    }
+
+    PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
+    if(pm.isIgnoringBatteryOptimizations(context.getPackageName())) {
+      return false;
+    }
+
+    return true; // yip, asking for disabling battery optimisations makes sense
+  }
 }
diff --git a/src/org/thoughtcrime/securesms/connect/KeepAliveService.java b/src/org/thoughtcrime/securesms/connect/KeepAliveService.java
index c00f2e26b..7c3444073 100644
--- a/src/org/thoughtcrime/securesms/connect/KeepAliveService.java
+++ b/src/org/thoughtcrime/securesms/connect/KeepAliveService.java
@@ -7,6 +7,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.IBinder;
+import android.os.PowerManager;
 import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 
@@ -20,6 +21,18 @@ public class KeepAliveService extends Service {
     public static void startSelf(Context context)
     {
         try {
+            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                PowerManager powerManager = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
+                if(powerManager.isIgnoringBatteryOptimizations(context.getPackageName())) {
+                    return; // fine, the user has disabled the battery optimisations for us
+                }
+            }
+            else {
+                return; // android <= lollipop does not have a doze mode
+            }
+
+            // if we're here, we're on a system with doze mode and battery optimisations enabled.
+            // add foreground notification to stay alive.
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 // the started service has to call startForeground() within 5 seconds,
                 // see https://developer.android.com/about/versions/oreo/android-8.0-changes

From 4866b5ea408088605452abd2a77c6bcbdb08b525 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sat, 9 Feb 2019 01:20:50 +0100
Subject: [PATCH 3/6] use unique icon for the permanent notification

---
 res/drawable-hdpi/notification_permanent.png     | Bin 0 -> 1203 bytes
 res/drawable-mdpi/notification_permanent.png     | Bin 0 -> 799 bytes
 res/drawable-xhdpi/notification_permanent.png    | Bin 0 -> 1665 bytes
 res/drawable-xxhdpi/notification_permanent.png   | Bin 0 -> 2432 bytes
 .../securesms/connect/KeepAliveService.java      |   2 +-
 5 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 res/drawable-hdpi/notification_permanent.png
 create mode 100644 res/drawable-mdpi/notification_permanent.png
 create mode 100644 res/drawable-xhdpi/notification_permanent.png
 create mode 100644 res/drawable-xxhdpi/notification_permanent.png

diff --git a/res/drawable-hdpi/notification_permanent.png b/res/drawable-hdpi/notification_permanent.png
new file mode 100644
index 0000000000000000000000000000000000000000..a51a0b7246adeaf7c7a9e0c4338f24e5608c7ed4
GIT binary patch
literal 1203
zcmV;k1WfyhP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00004b3#c}2nYxW
zd<bNS00009a7bBm000VM000VM0sPELB>(^b8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11TaZNK~z|U&6rJWRYerXfB#o1g<va$kE)GDtJV;OU{q)mP&Y12
zj0=OJF=#aELNw9D#9&NxN05~){8(rZV+clA8c1}ZrbbXPv=LIF0V1@tsAwTAwCQm%
z^V<8SGw<G4B=Ns`bMKjRe=}$1%$W!OGijzB&FpHR1y~5o^^YfjKY)H<K$2ZiATzrL
z=m72luFvT|3>*TwBpv-vfy}HCcnIhOW)*dwQ6KO{5wKh!Gg}Qj##C6QnE>a3lDA3u
zG~iocm!z?pfy}G~tOxFmIPM011P%kk*|p+l^G2W@SOv@r`kw^0N&2TSkcW8|w^p(m
z2i}v^<89i3#s1w1Nyh^}4Zt(Nionkx@J<XW1@t&@U*y#fl0GuCX5b~<4$G<+_(alB
z#@8(1RiG`fJqc_H!&i#HtV+OuTPpx-A}|2A0-MZiS^0saaiAw+djs%j_^<-V=a%&e
z7=Szch<kA1i)k+KvYD+jvn6KMic1wStueETnX3qynLUXceKqX|J_eeBr+}q7_IWxc
zX-l~=IYXJGm#2Gx=Yb($Gq4?q?wEpV%g$0ZWE~VwdMkm~fkl$KfH#4?q{En}&KOX*
z#q-nxykTZ5C5=kj4ZH;$oB_~sGt(rHna#tUO|_~4c)`r>2aq%*>3v`u@K+6f8u9t8
z9HJI#J7_0>Uw{L^VM!y|mp*a64Qv4JEa>w(;7l24aW%_8J-GAe41k%{nb`_lHeLXH
zD(S4G5i|P`cmh~k!0&vRnxQ!bIvB7A*jGNg%<LxMX<$jlZljrP_Up>b>@)BG?i~LO
zFtw=b3IOeqv^N9O3cM1)09*^KD>uCT4&ZE#|B)=v#T?^4U|+f6cf<zZs)T)~nN5O9
zx(Ixk^Nn*^pu8RNbx@8j#chO?N=y&YeqgjppHo?&{v4oRgLZgw$8<}!A?Xq@kgy$;
zG?)b%z}3JpjY+x?JZmZd6tnp|Vf$10M+qhu-l2qXoiD~}RqV#mn6T@r0P^}i;kd-~
z+UI=CFwmbBUv<@EY~A&i!&Lz!={Mk5!uj%`eWCzRZ_r*1)JN<NWE){9b`ziK2mA=L
zA3IkCW|Yi~n^_a^aKg4P3FPlh-$Xh!0neFPowu6+cH+*oP!quRash8<bAT5~U!y8E
zOl+}!PCO*Hd#HL3br9GJ9KqE=WB&J6Nk4m-MYsaLH30)b4VJofGy<;?KXm(nosy2E
zzF=mvaTkRL@n=*OeNY}i5-0<;k@V<J;}YiYxLr3J7uuVF+en8f)OV70<N|r9dfY*|
zHqZ7lGz@I=nY{3y4Q;?96gx6Pox+v1M{y_meB4!g8B>MfE=gY%1`5DBaK%_G>jGTD
z<+E;}JDc<({ubiy|LwrLlEyFR536Qe?Xv*4Q!W6<fzv)M)atJ^lYUoR{{jY(WkyRf
RaF751002ovPDHLkV1m_H96A61

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/notification_permanent.png b/res/drawable-mdpi/notification_permanent.png
new file mode 100644
index 0000000000000000000000000000000000000000..c28f3fb711929610132ef3d5355a8c2ba8b97f45
GIT binary patch
literal 799
zcmV+)1K|9LP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000K;000K;0UmWYH2?qr8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10-Q-iK~zYIwben0R#g-S@Zb5GNgHj3f*P}gtO$#oFj^#HL(w7;
zY11kwTD1tOT?7%d2n>P(3EQ}DX%S42f^AwTGN4V7mNJV-$3Pl&5*_ojc=y?x_r1@L
zi2kel?mg%KKlj{o&f|YZ-0UzjS79@@;9lH;9xmW4<}e!(i~mX>Gke&MUATQnkjprP
znTWVNR3J0g;5BS2TURiPlek!X#;_4nxU<+TU~fd69Vk%9-^RMKwS<p~-PS@pkMAPl
zdS;H`Wjs~v|HOw8vCt<_(()!AX=u*jGklCyjr~*D7ZK+(a};}2Z&Tl7cb%?Y!|CZ3
zIXr;1IErlSKZy4-b0=PG@l0aJiW`(_`2gekaSoqi0x#j74x2WX@oq#c*2+@@$l-3h
zgV7Si7q~h^U{qDwH?H>h5Qj0mf$50&8t>!S5TDI3Qa<jxiQ#2@iz7HwD(zB4?9I$4
z@oI^<jmf6K!~pW2Rn_uGW^TeOxF4r7^OJ};nweMey8fP;;GYzY=*O?vQ^+62TdL*?
zJcQ>VB97xghyQX@;6jJN{)ng_bElQ12+x+@fp2iFb^d!(V4-!GIMMjt&=J5IrQ;*w
zVolh<k4=H^I|QzAqr=BK1mM;I`-#I%fmtPI1wGtVqPwm;h3cp?b6lyKg46ZT>lKnk
z)yQpPdt?1e2l-q?ER}Wpjpmw>)|gR^g&NOg<`ZST-^zD7gU?I!)0l3FU#b`FaXqOT
z3w6%_!dEz0zBj6x>SVEb0oyumHxm(G_6Zb`b*jc`=5z@^;XH1^dQ~rU^$*NP#O_Xk
zB66E*<UV6?rPTNhKd45^dOU{Js(-@#u%G_8YAQ~Z8;uvDdDR#>9uenSKBIUPt0Us@
dkl_A1{szLZ#!MX?#?Sx&002ovPDHLkV1jWKcAx+N

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/notification_permanent.png b/res/drawable-xhdpi/notification_permanent.png
new file mode 100644
index 0000000000000000000000000000000000000000..db42c978ca698bcee79a11f63109683b075cd373
GIT binary patch
literal 1665
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
LNkvXXu0mjfqeTZp

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/notification_permanent.png b/res/drawable-xxhdpi/notification_permanent.png
new file mode 100644
index 0000000000000000000000000000000000000000..960b1043cbd5bbaf84b810c15af1a547f1f73d34
GIT binary patch
literal 2432
zcmV-`34iv9P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00004b3#c}2nYxW
zd<bNS00009a7bBm000!j000!j0TpmfLI3~&8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H12>nS!K~#90?VNqAmSr8sKVRe>G<66<2_m4WkjWIutcdy2Tx)A;
zb5^cdW^2|mdY`pwYtFUia>EK|(5mHDSyo1D6jOVF!Z3t<Ij9f>q81nm=Omn8fBde4
z&$-Y2a$Wa*KL^|RZqLqnp6j}Q*YEj0*L_{Tx9f(ZIEtg_A~f6sn%NlOG+-Jq6*w6<
z78nnV1C9ZDfrG$);CbLVU^nm-uw7FBaOpcN1ew`n;5^_=oScyj#PtGOfDOQ3CGBsn
zVKKT!keQ7H762Clv%56bL0}WGM$%(lkl()2W;P0VD{v`reB1I%uod_X@USFnOK7VE
znb`v1O5inZ%1y)*z>g&DY(rQp1cf!`8hnj;HJ~3@4csf~U=u-&2{N<uf%gGpYl`Rt
z_Th`~q43$rAn!O}R0H+40e4DzuC9RE1cgQTDqvB{Wk3(`X!!e#q<t0R91ENTOb2EH
zXX9o;EP8=uk~Sw?a~QP<3bxD*xUw<m2kr-cC+XQbV|I)^0+<C{1e}lCO;tDqd|%R^
zQpZas$jrtAH{wdh;91~1l6Ity6`{*i;Df*^G2MY5OZsif7)b<$nR639)no7<;1)^$
z&d50dHyq~xlW`0B5U>Z>1+0~{B~qucz-NHh#&ic(NLm}Ie>_2Eb`0=QU~cR+z}=G8
zbjTP5T!Gt3Rky}=;0KbnM(8#H|KVb0Qa^Bqq(>t9G9so^z}2LY1CUkXI^gZZtsAER
zpEa{9!n#ukNiP8_B6S)8TxVvJVmnvD%+AAq^;GQbkTDsUpLqQU+#>&YSo;bQ*0>iU
z<&FnF9CqSL1xjINCjsw|95{;;JN|EC&zuQ-&dg3O>JYwcDTx`(0Nz#ADP{&WF#^x+
z_<t9^qt(R};PYWN=V1})Kf=XkHm$5f=^`Dh<PRkd+KGL@R|bqhGn)x~gyv4{W55Hz
z4t&-u#Fv1SHFW?zz&DB<+(LrFmi|?mf0-@7?UMR}-0{GBfHyUi+a{Ju+L+f+#`s%k
zCtNWbUu4GuNZK!H1+Wy47QPyAc~L_yL1DqWq(ud01D`ari31;mU+l}k&vA$KNMfd$
z<whckX3zrK4|dG}J{7im03^LEX(jL_U@dOx9x3FSF+~Kuxl2k+1-@Wrox2;7_DWg~
z+zLG1rLn8<hCEwq2tmQZjCDloU>tCRnOzm!m&1_sG)~fY=`b>f2_td;a1iol&;q)j
z?GSJ=up~IHuQW&|X&rvs-3PqfWnDTkFZ)3rL1ztvA_JHO+-zn;#+1}2=@-Bk8NT&t
zPS)=m^v29a6CcWG3lo8lnc3xLHe}{X+7s5N+vvVoFb<Dg9!7Qs&7xUSuL%~0S1u$y
zjvKCP=<aNq(fKAzMoiGDE$qazqnm&olKxwDL9oW}HnWF-Yw=)P+nCb%CQDGEx7-r?
zfCqsGB|TGDh@>7f`x<aP=`pG*4B{Y5&=k6ZKK#~L9g)R25ufJMfjyEQ$m=Jm*UXjz
z9{?_BQP<88%@BgRkt%))SYDRR2qDvjxQTIUrfrg>d-AT6)Nf`h@Cap57$g;gLOWT4
z>c)NY&=33ySXorA5)8#fz&j}pc3oy>yCwZ0uQ8Cc9N!IJ-&kwk$qpmCi;Zbv0C3}O
znWXzl$e92v!9yQak-%%r?6jiBkY4^4zVJ82=*~A;f|`Uy2hb1PC22!ZhmbA(H1RIY
zNIZsIIKw6N0?T<NeO(uWA`4l9D!1AQ{IY@^;S1~3M7bwW5kr>r4`5}Y+$;taWMv8J
zZ76&z)e2rj{jK?JS>G)OtMG(nT?}%P+a~CzWyMQj_FURP{zyEpR)}D5u5K{KAp0y!
z(7zf8-Y)5hiav8`Zv9@6=d)$7j{5G%KRe%K3EEv#D8Qd1`m|ACbvzk|G7Cw2sULV7
z^dq-P(Blz(W;c+ZDyI%X`|woKVPpx~RzoQG)*fSnwB-!P_>6UultT(Y^9ZW5P#=&~
z8u<%(wzfhkF-4+v>ZjLbKNv(%uzIT&+C0SAPbqoxD#Td)sbS+?l6tZq=7n50B?<<Z
z5Yea2ICo4QEk>tK{66o)Jc8Ea73?V(9d4mA97vSeR91?meh|p5UmQYEC`QW7Q&*rW
zRMJa(q0*Q-pp?|r!{K`mK~dr`H%L{1Q_C8|?$D^hwF6tr8beJ}%8vQRqJ~_8Bt2TC
zL=Mi0=#wh52vs&tN;TXIc-?j`%BnkloiGS^>h`#bK0|hi8t9R<r>HULkV4Srvh!zU
z1Z~7?dtxyPxU8bjdYXq+?yqRSlC;QZ>31w7D6APjBrO27*vtz3BuNLzF~$<`Bu;WJ
zLPcC^0Do6mV^w+WP9UW+eFR>ZP-cVt4EK3b(F=U9D4Y_?`>w4a_r<ctn3}$ON%PSr
z0iP%$DQu_9Npooq0N<39>r97Pdn1{6awJM!q)LK9Kztc#zRh&trV^4i1GnHQp(;EH
z+$t%zubG{JSJ_X@YmdOVvc{C72=nlx2q~4MJMe=nx%N*8e9go2VRP{FVg2~lJFwnt
z%)70^wU+?zPSh!j+slqhr5<KkhzHzLuImGSf~T8HE$L8tViEnO0`J91ZHjv&ttx7)
za~x_hp36$Twg(TWZ>oFf*372hG3^U!HfuVuLDIL28tWdYTZr!%F^5vJ*o8ZWJ;2tg
zhXjP8&$IAz9;efO^;<8nr08sGlOvgD<JA?Vi(Ccz@F4k%;q?+8>luyjhEqs8epwfH
zNcvk|L!)0K6ntJ!g`@g^fc28@%xh?LA4_^3_&UC}G)?&)Nz5-wNVaxAhf_0G181})
zvj%qJ*_GY+?K>KeUr)p1LuI$?s=P9rZakXe9N-=JLrl62!;Q_q;Pz5s;xpJy)A5tq
zbMa!;&O2y7aC0_r*3E~ToDM9;4Z$`GLl5B|_#?nW*#pC|2o)v^aOZZQaC68k>iXkx
zLV5qWz#DPHE_K%%h(vC|6AFJ1r7msiI29*rK5$#e%mTywfTdt5zYf3sCWqG~Jbp7K
yy!PRd$AQ<jZa*WaLq7py+WrBK;wX-y5dQ=IDZ;b+xCeRw0000<MNUMnLSTYLYit7m

literal 0
HcmV?d00001

diff --git a/src/org/thoughtcrime/securesms/connect/KeepAliveService.java b/src/org/thoughtcrime/securesms/connect/KeepAliveService.java
index 7c3444073..68babad0e 100644
--- a/src/org/thoughtcrime/securesms/connect/KeepAliveService.java
+++ b/src/org/thoughtcrime/securesms/connect/KeepAliveService.java
@@ -106,7 +106,7 @@ public class KeepAliveService extends Service {
         }
         builder.setWhen(0);
         builder.setContentIntent(contentIntent);
-        builder.setSmallIcon(R.drawable.icon_notification);
+        builder.setSmallIcon(R.drawable.notification_permanent);
         return builder.build();
     }
 }

From 46ac343181ed0d4f674edeca3df3cfa5bfc28d83 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sat, 9 Feb 2019 01:33:22 +0100
Subject: [PATCH 4/6] define a notification channel, closes #708

---
 .../securesms/connect/KeepAliveService.java   | 21 +++++++++++++++++++
 .../AbstractNotificationBuilder.java          | 18 ++++++++++++++++
 .../MultipleRecipientNotificationBuilder.java |  5 +++++
 .../SingleRecipientNotificationBuilder.java   |  4 ++++
 4 files changed, 48 insertions(+)

diff --git a/src/org/thoughtcrime/securesms/connect/KeepAliveService.java b/src/org/thoughtcrime/securesms/connect/KeepAliveService.java
index 68babad0e..fcfb818f8 100644
--- a/src/org/thoughtcrime/securesms/connect/KeepAliveService.java
+++ b/src/org/thoughtcrime/securesms/connect/KeepAliveService.java
@@ -1,6 +1,9 @@
 package org.thoughtcrime.securesms.connect;
 
+import android.annotation.TargetApi;
 import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
@@ -107,6 +110,24 @@ public class KeepAliveService extends Service {
         builder.setWhen(0);
         builder.setContentIntent(contentIntent);
         builder.setSmallIcon(R.drawable.notification_permanent);
+        if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.O) {
+            createFgNotificationChannel(this);
+            builder.setChannelId(FG_CHANNEL_ID);
+        }
         return builder.build();
     }
+
+    private static boolean ch_created = false;
+    private static final String FG_CHANNEL_ID = "dc_foreground_notification_ch";
+    @TargetApi(Build.VERSION_CODES.O)
+    static private void createFgNotificationChannel(Context context) {
+        if(!ch_created) {
+            ch_created = true;
+            NotificationChannel channel = new NotificationChannel(FG_CHANNEL_ID,
+                "Receive messages in background.", NotificationManager.IMPORTANCE_DEFAULT);
+            channel.setDescription("Ensure reliable message receiving.");
+            NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+            notificationManager.createNotificationChannel(channel);
+        }
+    }
 }
diff --git a/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java
index d13a0b6b8..71fb00a37 100644
--- a/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java
+++ b/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java
@@ -1,9 +1,13 @@
 package org.thoughtcrime.securesms.notifications;
 
+import android.annotation.TargetApi;
 import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.content.Context;
 import android.graphics.Color;
 import android.net.Uri;
+import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
@@ -86,4 +90,18 @@ public abstract class AbstractNotificationBuilder extends NotificationCompat.Bui
 
     return blinkPattern.split(",");
   }
+
+  private static boolean ch_created = false;
+  protected static final String MSG_CHANNEL_ID = "dc_message_notification_ch";
+  @TargetApi(Build.VERSION_CODES.O)
+  protected void createMsgNotificationChannel(Context context) {
+    if(!ch_created) {
+      ch_created = true;
+      NotificationChannel channel = new NotificationChannel(MSG_CHANNEL_ID,
+          "Message notifications", NotificationManager.IMPORTANCE_DEFAULT);
+      channel.setDescription("Informs about new messages.");
+      NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+      notificationManager.createNotificationChannel(channel);
+    }
+  }
 }
diff --git a/src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
index 077efe658..ffdca5fa4 100644
--- a/src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
+++ b/src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
@@ -4,6 +4,7 @@ import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
@@ -41,6 +42,10 @@ public class MultipleRecipientNotificationBuilder extends AbstractNotificationBu
 
     setColor(context.getResources().getColor(R.color.delta_primary));
     setSmallIcon(R.drawable.icon_notification);
+    if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.O) {
+      createMsgNotificationChannel(context);
+      setChannelId(MSG_CHANNEL_ID);
+    }
     setContentTitle(context.getString(R.string.app_name));
     setContentIntent(PendingIntent.getActivity(context, 0, new Intent(context, ConversationListActivity.class), 0));
     setCategory(NotificationCompat.CATEGORY_MESSAGE);
diff --git a/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
index 55fcf32f0..0fedd1c30 100644
--- a/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
+++ b/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
@@ -51,6 +51,10 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
     super(context, privacy);
 
     setSmallIcon(R.drawable.icon_notification);
+    if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.O) {
+      createMsgNotificationChannel(context);
+      setChannelId(MSG_CHANNEL_ID);
+    }
     setColor(context.getResources().getColor(R.color.delta_primary));
     setPriority(Prefs.getNotificationPriority(context));
     setCategory(NotificationCompat.CATEGORY_MESSAGE);

From c9fc1c506f5cf482e71e4605e4ea45a668df4c1c Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sat, 9 Feb 2019 01:44:32 +0100
Subject: [PATCH 5/6] move reminder text to strings.xml

---
 res/values/strings.xml                                        | 2 ++
 .../securesms/components/reminder/DozeReminder.java           | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ec79baba5..706724cdf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -480,6 +480,8 @@
     <string name="perm_explain_access_to_mic_denied">Delta Chat requires the Microphone permission in order to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
     <string name="perm_explain_access_to_storage_denied">Delta Chat requires the Storage permission in order to attach or export photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
     <string name="perm_explain_access_to_location_denied">Delta Chat requires Location permission in order to attach a location, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Location\".</string>
+    <string name="perm_enable_bg_reminder_title">Tap here to receive messages while Delta Chat is in background.</string>
+    <string name="perm_enable_bg_reminder_text">Delta Chat uses minimal resources and takes care not to drain your battery.</string>
 
     <!-- languages -->
     <string name="language_be">Belgian</string>
diff --git a/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java b/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java
index e0ab84452..9efc77e0a 100644
--- a/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java
+++ b/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java
@@ -23,8 +23,8 @@ public class DozeReminder extends Reminder {
 
   @RequiresApi(api = Build.VERSION_CODES.M)
   public DozeReminder(@NonNull final Context context) {
-    super("Tap here to receive messages while Delta Chat is in background.",
-          "Delta Chat uses minimal resources and takes care not to drain your battery.");
+    super(context.getString(R.string.perm_enable_bg_reminder_title),
+          context.getString(R.string.perm_enable_bg_reminder_text));
 
     setOkListener(v -> {
       if(ContextCompat.checkSelfPermission(context, Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)==PackageManager.PERMISSION_GRANTED) {

From 15a2951b209a17635c37abda4e52b0bab9457510 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sat, 9 Feb 2019 02:22:56 +0100
Subject: [PATCH 6/6] use min. importance for permanent foreground notification
 so that no sound is played on oreo, fixes #710

---
 src/org/thoughtcrime/securesms/connect/KeepAliveService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/connect/KeepAliveService.java b/src/org/thoughtcrime/securesms/connect/KeepAliveService.java
index fcfb818f8..02860b687 100644
--- a/src/org/thoughtcrime/securesms/connect/KeepAliveService.java
+++ b/src/org/thoughtcrime/securesms/connect/KeepAliveService.java
@@ -124,7 +124,7 @@ public class KeepAliveService extends Service {
         if(!ch_created) {
             ch_created = true;
             NotificationChannel channel = new NotificationChannel(FG_CHANNEL_ID,
-                "Receive messages in background.", NotificationManager.IMPORTANCE_DEFAULT);
+                "Receive messages in background.", NotificationManager.IMPORTANCE_MIN); // IMPORTANCE_DEFAULT will play a sound
             channel.setDescription("Ensure reliable message receiving.");
             NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
             notificationManager.createNotificationChannel(channel);