Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #134 from TwidereProject/data_export_crash 

fixed data export/import crash
This commit is contained in:
Mariotaku 2015-04-26 02:18:53 +08:00
parent b249439e10 688e7059d6
commit 46bbd25513
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
twidere/src/main/java/org/mariotaku/twidere/activity/support/DataExportActivity.java
View File

@ -19,12 +19,17 @@ import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.Locale; import java.util.Locale;
public class DataExportActivity extends BaseAppCompatActivity implements FileSelectorDialogFragment.Callback, public class DataExportActivity extends ThemedFragmentActivity implements FileSelectorDialogFragment.Callback,
DataExportImportTypeSelectorDialogFragment.Callback { DataExportImportTypeSelectorDialogFragment.Callback {
private ExportSettingsTask mTask; private ExportSettingsTask mTask;
@Override @Override
public int getThemeColor() {
return ThemeUtils.getThemeColor(this);
}
@Override
public int getThemeResourceId() { public int getThemeResourceId() {
return ThemeUtils.getNoDisplayThemeResource(this); return ThemeUtils.getNoDisplayThemeResource(this);
} }

8
twidere/src/main/java/org/mariotaku/twidere/activity/support/DataImportActivity.java
View File

@ -5,6 +5,7 @@ import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.support.v4.app.DialogFragment; import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import org.mariotaku.twidere.R; import org.mariotaku.twidere.R;
@ -17,12 +18,17 @@ import org.mariotaku.twidere.util.ThemeUtils;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
public class DataImportActivity extends BaseAppCompatActivity implements FileSelectorDialogFragment.Callback, public class DataImportActivity extends ThemedFragmentActivity implements FileSelectorDialogFragment.Callback,
DataExportImportTypeSelectorDialogFragment.Callback { DataExportImportTypeSelectorDialogFragment.Callback {
private ImportSettingsTask mImportSettingsTask; private ImportSettingsTask mImportSettingsTask;
private OpenImportTypeTask mOpenImportTypeTask; private OpenImportTypeTask mOpenImportTypeTask;
@Override
public int getThemeColor() {
return ThemeUtils.getThemeColor(this);
}
@Override @Override
public int getThemeResourceId() { public int getThemeResourceId() {
return ThemeUtils.getNoDisplayThemeResource(this); return ThemeUtils.getNoDisplayThemeResource(this);