thedevstack/PiratX-NoCleanFork
2
0
Fork 0
forked from mirror/monocles_chat
Code Issues 5 Pull requests Wiki Activity

improved export/import app settings (Christian Schneppe)

Browse source
This commit is contained in:
Arne 2021-12-08 23:14:49 +01:00
parent bf7d477bd6
commit d3c60c4cfc
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/services/ExportBackupService.java
View file

@ -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;

5
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
View file

@ -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));