owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(save-backup): use ACTION_CREATE_DOCUMENT instead of "Sharing" the backup file

Browse Source
This commit is contained in:
LucasGGamerM
2024-05-11 14:05:48 -03:00
parent 95ba52b761
commit 96c1c036a8
1 changed files with 47 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
View File

@@ -37,7 +37,6 @@ import org.joinmastodon.android.ui.M3AlertDialogBuilder;
import org.joinmastodon.android.ui.Snackbar; import org.joinmastodon.android.ui.Snackbar;
import org.joinmastodon.android.ui.utils.UiUtils; import org.joinmastodon.android.ui.utils.UiUtils;
import org.joinmastodon.android.updater.GithubSelfUpdater; import org.joinmastodon.android.updater.GithubSelfUpdater;
import org.joinmastodon.android.utils.FileProvider;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
@@ -46,6 +45,7 @@ import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.OutputStream;
import java.time.Instant; import java.time.Instant;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
@@ -63,6 +63,7 @@ import me.grishka.appkit.utils.V;
public class SettingsAboutAppFragment extends BaseSettingsFragment<Void> implements HasAccountID{ public class SettingsAboutAppFragment extends BaseSettingsFragment<Void> implements HasAccountID{
private static final String TAG="SettingsAboutAppFragment"; private static final String TAG="SettingsAboutAppFragment";
private static final int IMPORT_RESULT=314; private static final int IMPORT_RESULT=314;
private static final int EXPORT_RESULT=271;
private ListItem<Void> mediaCacheItem, copyCrashLogItem; private ListItem<Void> mediaCacheItem, copyCrashLogItem;
private CheckableListItem<Void> enablePreReleasesItem; private CheckableListItem<Void> enablePreReleasesItem;
private AccountSession session; private AccountSession session;
@@ -161,40 +162,11 @@ public class SettingsAboutAppFragment extends BaseSettingsFragment<Void> impleme
} }
private void onExportClick(ListItem<?> item){ private void onExportClick(ListItem<?> item){
Gson gson = new Gson(); // The magic will happen on the onActivityResult Method
JsonObject jsonObject = new JsonObject(); Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
jsonObject.addProperty("versionName", BuildConfig.VERSION_NAME);
jsonObject.addProperty("versionCode", BuildConfig.VERSION_CODE);
// GlobalUserPreferences
//TODO: remove prefs that should not be exported
JsonElement je = gson.toJsonTree(GlobalUserPreferences.getPrefs().getAll());
jsonObject.add("GlobalUserPreferences", je);
// add account local prefs
for(AccountSession accountSession: AccountSessionManager.getInstance().getLoggedInAccounts()) {
Map<String, ?> prefs = accountSession.getRawLocalPreferences().getAll();
//TODO: remove prefs that should not be exported
JsonElement accountPrefs = gson.toJsonTree(prefs);
jsonObject.add(accountSession.self.id, accountPrefs);
}
try {
File file = new File(getContext().getCacheDir(), "moshidon-exported-settings.json");
FileWriter writer = new FileWriter(file);
writer.write(jsonObject.toString());
writer.flush();
writer.close();
Intent intent = new Intent(Intent.ACTION_SEND);
intent.setType("application/json"); intent.setType("application/json");
Uri outputUri = FileProvider.getUriForFile(getContext(), getContext().getPackageName() + ".fileprovider", file); intent.putExtra(Intent.EXTRA_TITLE,"moshidon-exported-settings.json");
intent.putExtra(Intent.EXTRA_STREAM, outputUri); startActivityForResult(intent, EXPORT_RESULT);
startActivity(Intent.createChooser(intent, getContext().getString(R.string.export_settings_share)));
} catch (IOException e) {
Toast.makeText(getContext(), getContext().getString(R.string.export_settings_fail), Toast.LENGTH_SHORT).show();
Log.w(TAG, e);
}
} }
private void onImportClick(ListItem<?> item){ private void onImportClick(ListItem<?> item){
@@ -292,6 +264,46 @@ public class SettingsAboutAppFragment extends BaseSettingsFragment<Void> impleme
Toast.makeText(getContext(), getContext().getString(R.string.import_settings_failed), Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), getContext().getString(R.string.import_settings_failed), Toast.LENGTH_SHORT).show();
} }
} }
if(requestCode == EXPORT_RESULT && resultCode==Activity.RESULT_OK) {
try{
Gson gson = new Gson();
JsonObject jsonObject = new JsonObject();
jsonObject.addProperty("versionName", BuildConfig.VERSION_NAME);
jsonObject.addProperty("versionCode", BuildConfig.VERSION_CODE);
// GlobalUserPreferences
//TODO: remove prefs that should not be exported
JsonElement je = gson.toJsonTree(GlobalUserPreferences.getPrefs().getAll());
jsonObject.add("GlobalUserPreferences", je);
// add account local prefs
for(AccountSession accountSession: AccountSessionManager.getInstance().getLoggedInAccounts()) {
Map<String, ?> prefs = accountSession.getRawLocalPreferences().getAll();
//TODO: remove prefs that should not be exported
JsonElement accountPrefs = gson.toJsonTree(prefs);
jsonObject.add(accountSession.self.id, accountPrefs);
}
File file = new File(getContext().getCacheDir(), "moshidon-exported-settings.json");
FileWriter writer = new FileWriter(file);
writer.write(jsonObject.toString());
writer.flush();
writer.close();
// Got this from stackoverflow at https://stackoverflow.com/a/67046741
InputStream is = new FileInputStream(file);
OutputStream os = getContext().getContentResolver().openOutputStream(data.getData());
byte[] buffer = new byte[1024];
int length;
while ((length = is.read(buffer)) > 0) {
os.write(buffer, 0, length);
}
}catch(IOException e){
Toast.makeText(getContext(), e.getMessage(), Toast.LENGTH_SHORT);
}
}
} }
private void savePrefValue(SharedPreferences.Editor editor, String key, Object value) { private void savePrefValue(SharedPreferences.Editor editor, String key, Object value) {