From 417a6e83077de656146b2ed05072be68b4fbaa84 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 25 Feb 2019 20:26:52 +0100
Subject: [PATCH] use proper theme in restore activity. fixes #3389

---
 .../siacs/conversations/ui/ImportBackupActivity.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/conversations/java/eu/siacs/conversations/ui/ImportBackupActivity.java b/src/conversations/java/eu/siacs/conversations/ui/ImportBackupActivity.java
index 77a6787f5..d5de333da 100644
--- a/src/conversations/java/eu/siacs/conversations/ui/ImportBackupActivity.java
+++ b/src/conversations/java/eu/siacs/conversations/ui/ImportBackupActivity.java
@@ -23,6 +23,7 @@ import eu.siacs.conversations.databinding.ActivityImportBackupBinding;
 import eu.siacs.conversations.databinding.DialogEnterPasswordBinding;
 import eu.siacs.conversations.services.ImportBackupService;
 import eu.siacs.conversations.ui.adapter.BackupFileAdapter;
+import eu.siacs.conversations.utils.ThemeHelper;
 
 public class ImportBackupActivity extends ActionBarActivity implements ServiceConnection, ImportBackupService.OnBackupFilesLoaded, BackupFileAdapter.OnItemClickedListener, ImportBackupService.OnBackupProcessed {
 
@@ -31,8 +32,12 @@ public class ImportBackupActivity extends ActionBarActivity implements ServiceCo
     private BackupFileAdapter backupFileAdapter;
     private ImportBackupService service;
 
+    private int mTheme;
+
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
+        this.mTheme = ThemeHelper.find(this);
+        setTheme(this.mTheme);
         super.onCreate(savedInstanceState);
         binding = DataBindingUtil.setContentView(this, R.layout.activity_import_backup);
         setSupportActionBar((Toolbar) binding.toolbar);
@@ -45,7 +50,12 @@ public class ImportBackupActivity extends ActionBarActivity implements ServiceCo
     @Override
     public void onStart() {
         super.onStart();
-        bindService(new Intent(this, ImportBackupService.class), this, Context.BIND_AUTO_CREATE);
+        final int theme = ThemeHelper.find(this);
+        if (this.mTheme != theme) {
+            recreate();
+        } else {
+            bindService(new Intent(this, ImportBackupService.class), this, Context.BIND_AUTO_CREATE);
+        }
     }
 
     @Override