From d3c60c4cfcb27a49d193d587502391d2a38cbf7d Mon Sep 17 00:00:00 2001 From: Arne <arne@monocles.de> Date: Wed, 8 Dec 2021 23:14:49 +0100 Subject: [PATCH] improved export/import app settings (Christian Schneppe) --- .../eu/siacs/conversations/services/ExportBackupService.java | 2 ++ .../java/eu/siacs/conversations/ui/SettingsActivity.java | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/main/java/eu/siacs/conversations/services/ExportBackupService.java b/src/main/java/eu/siacs/conversations/services/ExportBackupService.java index f9352267e..c5710fbc7 100644 --- a/src/main/java/eu/siacs/conversations/services/ExportBackupService.java +++ b/src/main/java/eu/siacs/conversations/services/ExportBackupService.java @@ -26,9 +26,11 @@ import com.google.common.base.Strings; import java.io.BufferedWriter; import java.io.DataOutputStream; import java.io.File; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.FileWriter; import java.io.IOException; +import java.io.ObjectOutputStream; import java.io.PrintWriter; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java index c5cfc0109..bbc61c5cc 100644 --- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java @@ -27,6 +27,10 @@ import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.ObjectInputStream; import java.security.KeyStoreException; import java.util.ArrayList; import java.util.Arrays; @@ -307,6 +311,7 @@ public class SettingsActivity extends XmppActivity implements return true; }); } + final Preference importSettingsPreference = mSettingsFragment.findPreference("import_settings"); if (importSettingsPreference != null) { importSettingsPreference.setSummary(getString(R.string.pref_import_settings_summary));