From 0c90ffe0f87e9a92bbf75ddf1d32b5ef9c8fe6ef Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 9 Nov 2018 16:16:41 +0000
Subject: [PATCH] Fixes

---
 app/src/main/AndroidManifest.xml                      | 2 +-
 app/src/main/java/eu/faircode/email/ActivityView.java | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 15f764e2f4..c5d982fb49 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -114,7 +114,7 @@
         <service
             android:name=".ServiceTileSynchronize"
             android:icon="@drawable/baseline_sync_disabled_24"
-            android:label="@string/tile_synchronize"
+            android:label="@string/app_name"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 1b7dc16fd2..645682c776 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -428,8 +428,10 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                 drawerLayout.closeDrawer(drawerList);
             drawerToggle.setDrawerIndicatorEnabled(count == 1);
 
-            Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.content_pane);
-            grpPane.setVisibility(fragment == null ? View.GONE : View.VISIBLE);
+            if (grpPane != null) {
+                Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.content_pane);
+                grpPane.setVisibility(fragment == null ? View.GONE : View.VISIBLE);
+            }
         }
     }