wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix settings export on API 19+

Browse source
This commit is contained in:
cketti 2017-03-12 17:03:10 +01:00
parent 17ebb4c613
commit 5fa77adfcb
2 changed files with 48 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
k9mail/src/main/java/com/fsck/k9/activity/Accounts.java
View file

@ -29,6 +29,7 @@ import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.text.Editable;
@ -137,6 +138,9 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
private TextView mActionBarSubTitle;
private TextView mActionBarUnread;
private boolean exportGlobalSettings;
private ArrayList<String> exportAccountUuids;
/**
* Contains information about objects that need to be retained on configuration changes.
*
@ -329,6 +333,9 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
private static String ACCOUNT_STATS = "accountStats";
private static String STATE_UNREAD_COUNT = "unreadCount";
private static String SELECTED_CONTEXT_ACCOUNT = "selectedContextAccount";
private static final String STATE_EXPORT_GLOBAL_SETTINGS = "exportGlobalSettings";
private static final String STATE_EXPORT_ACCOUNTS = "exportAccountUuids";
public static final String EXTRA_STARTUP = "startup";
@ -477,6 +484,17 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
}
outState.putSerializable(STATE_UNREAD_COUNT, mUnreadMessageCount);
outState.putSerializable(ACCOUNT_STATS, accountStats);
outState.putBoolean(STATE_EXPORT_GLOBAL_SETTINGS, exportGlobalSettings);
outState.putStringArrayList(STATE_EXPORT_ACCOUNTS, exportAccountUuids);
}
@Override
protected void onRestoreInstanceState(Bundle state) {
super.onRestoreInstanceState(state);
exportGlobalSettings = state.getBoolean(STATE_EXPORT_GLOBAL_SETTINGS, false);
exportAccountUuids = state.getStringArrayList(STATE_EXPORT_ACCOUNTS);
}
private StorageManager.StorageListener storageListener = new StorageManager.StorageListener() {
@ -1887,9 +1905,6 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
}
public static final String EXTRA_INC_GLOBALS = "include_globals";
public static final String EXTRA_ACCOUNTS = "accountUuids";
public void onExport(final boolean includeGlobals, final Account account) {
// TODO, prompt to allow a user to choose which accounts to export
ArrayList<String> accountUuids = null;
@ -1898,36 +1913,28 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
accountUuids.add(account.getUuid());
}
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
exportGlobalSettings = includeGlobals;
exportAccountUuids = accountUuids;
Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
intent.addCategory(Intent.CATEGORY_OPENABLE);
intent.setType("text/plain");
intent.setType("application/octet-stream");
intent.putExtra(Intent.EXTRA_TITLE, SettingsExporter.EXPORT_FILENAME);
intent.putStringArrayListExtra(EXTRA_ACCOUNTS, accountUuids);
intent.putExtra(EXTRA_INC_GLOBALS, includeGlobals);
intent.addCategory(Intent.CATEGORY_OPENABLE);
PackageManager packageManager = getPackageManager();
List<ResolveInfo> infos = packageManager.queryIntentActivities(intent, 0);
if (infos.size() > 0) {
startActivityForResult(Intent.createChooser(intent, null), ACTIVITY_REQUEST_SAVE_SETTINGS_FILE);
} else {
showDialog(DIALOG_NO_FILE_MANAGER);
}
startActivityForResult(intent, ACTIVITY_REQUEST_SAVE_SETTINGS_FILE);
} else {
//Pre-Kitkat
ExportAsyncTask asyncTask = new ExportAsyncTask(this, includeGlobals, accountUuids, null);
setNonConfigurationInstance(asyncTask);
asyncTask.execute();
startExport(includeGlobals, accountUuids, null);
}
}
public void onExport(Intent intent) {
boolean includeGlobals = intent.getBooleanExtra(EXTRA_INC_GLOBALS, false);
ArrayList<String> accountUuids = intent.getStringArrayListExtra(EXTRA_ACCOUNTS);
Uri documentsUri = intent.getData();
startExport(exportGlobalSettings, exportAccountUuids, documentsUri);
}
ExportAsyncTask asyncTask = new ExportAsyncTask(this, includeGlobals, accountUuids, intent.getData());
private void startExport(boolean exportGlobalSettings, ArrayList<String> exportAccountUuids, Uri documentsUri) {
ExportAsyncTask asyncTask = new ExportAsyncTask(this, exportGlobalSettings, exportAccountUuids, documentsUri);
setNonConfigurationInstance(asyncTask);
asyncTask.execute();
}

36
k9mail/src/main/java/com/fsck/k9/preferences/SettingsExporter.java
View file

@ -17,11 +17,11 @@ import java.util.TreeMap;
import android.content.Context;
import android.net.Uri;
import android.os.Environment;
import timber.log.Timber;
import android.util.Xml;
import com.fsck.k9.Account;
import com.fsck.k9.K9;
import com.fsck.k9.Preferences;
import com.fsck.k9.helper.FileHelper;
import com.fsck.k9.mail.ServerSettings;
@ -81,7 +81,6 @@ public class SettingsExporter {
throws SettingsImportExportException {
OutputStream os = null;
String filename = null;
try {
File dir = new File(Environment.getExternalStorageDirectory() + File.separator + context.getPackageName());
if (!dir.mkdirs()) {
@ -89,7 +88,7 @@ public class SettingsExporter {
}
File file = FileHelper.createUniqueFile(dir, EXPORT_FILENAME);
filename = file.getAbsolutePath();
String filename = file.getAbsolutePath();
os = new FileOutputStream(filename);
exportPreferences(context, os, includeGlobals, accountUuids);
@ -99,13 +98,7 @@ public class SettingsExporter {
} catch (Exception e) {
throw new SettingsImportExportException(e);
} finally {
if (os != null) {
try {
os.close();
} catch (IOException ioe) {
Timber.w("Couldn't close exported settings file: %s", filename);
}
}
closeOrThrow(os);
}
}
@ -113,24 +106,29 @@ public class SettingsExporter {
throws SettingsImportExportException {
OutputStream os = null;
String filename = null;
try {
os = context.getContentResolver().openOutputStream(uri);
exportPreferences(context, os, includeGlobals, accountUuids);
} catch (Exception e) {
throw new SettingsImportExportException(e);
} finally {
if (os != null) {
try {
os.close();
} catch (IOException ioe) {
Log.w(K9.LOG_TAG, "Couldn't close exported settings file: " + filename);
}
}
closeOrThrow(os);
}
}
static void exportPreferences(Context context, OutputStream os, boolean includeGlobals, Set<String> accountUuids)
private static void closeOrThrow(OutputStream outputStream) throws SettingsImportExportException {
if (outputStream == null) {
return;
}
try {
outputStream.close();
} catch (IOException e) {
throw new SettingsImportExportException(e);
}
}
static void exportPreferences(Context context, OutputStream os, boolean includeGlobals, Set<String> accountUuids)
throws SettingsImportExportException {
try {