Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added OPML chooser dialog + autocreation of import directory at 

application start
This commit is contained in:
daniel oeh 2012-07-25 12:45:15 +02:00
parent 52a9a5ecee
commit a85a369f3a
3 changed files with 71 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/strings.xml
View File

@ -146,6 +146,7 @@
<string name="search_term_label">You searched:\u0020</string>
<string name="search_label">Search</string>
<string name="found_in_title_label">Found in title</string>
<string name="choose_file_to_import_label">Choose file to import</string>
</resources>

18
src/de/danoeh/antennapod/PodcastApp.java
View File

@ -1,5 +1,6 @@
package de.danoeh.antennapod;
import java.io.File;
import java.util.concurrent.TimeUnit;
import android.app.AlarmManager;
@ -10,6 +11,7 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import android.util.Log;
import de.danoeh.antennapod.activity.OpmlImportActivity;
import de.danoeh.antennapod.asynctask.FeedImageLoader;
import de.danoeh.antennapod.feed.FeedManager;
import de.danoeh.antennapod.receiver.FeedUpdateReceiver;
@ -41,10 +43,26 @@ public class PodcastApp extends Application implements
LOGICAL_DENSITY = getResources().getDisplayMetrics().density;
SharedPreferences prefs = PreferenceManager
.getDefaultSharedPreferences(this);
createImportDirectory();
prefs.registerOnSharedPreferenceChangeListener(this);
FeedManager manager = FeedManager.getInstance();
manager.loadDBData(getApplicationContext());
}
/** Creates the import directory if it doesn't exist and if storage is available */
private void createImportDirectory() {
File importDir = getExternalFilesDir(OpmlImportActivity.IMPORT_DIR);
if (importDir != null) {
if (importDir.exists()) {
if (AppConfig.DEBUG) Log.d(TAG, "Import directory already exists");
} else {
if (AppConfig.DEBUG) Log.d(TAG, "Creating import directory");
importDir.mkdir();
}
} else {
if (AppConfig.DEBUG) Log.d(TAG, "Could not access external storage.");
}
}
@Override
public void onLowMemory() {

66
src/de/danoeh/antennapod/activity/OpmlImportActivity.java
View File

@ -3,6 +3,8 @@ package de.danoeh.antennapod.activity;
import java.io.File;
import java.util.ArrayList;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
@ -26,7 +28,7 @@ import de.danoeh.antennapod.util.StorageUtils;
public class OpmlImportActivity extends SherlockActivity {
private static final String TAG = "OpmlImportActivity";
private static final String IMPORT_DIR = "import/";
public static final String IMPORT_DIR = "import/";
private TextView txtvPath;
private Button butStart;
@ -48,7 +50,7 @@ public class OpmlImportActivity extends SherlockActivity {
butStart.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
startImport();
checkFolderForFiles();
}
});
@ -95,17 +97,33 @@ public class OpmlImportActivity extends SherlockActivity {
return false;
}
}
private void startImport() {
/** Looks at the contents of the import directory and decides what to do. */
private void checkFolderForFiles() {
File dir = new File(importPath);
if (dir.isDirectory()) {
File[] fileList = dir.listFiles();
if (fileList.length > 1) {
if (fileList.length == 1) {
if (AppConfig.DEBUG) Log.d(TAG, "Found one file, choosing that one.");
startImport(fileList[0]);
} else if (fileList.length > 1) {
Log.w(TAG,
"Import directory contains more than one file. Might choose the wrong one");
"Import directory contains more than one file.");
askForFile(dir);
} else {
Log.e(TAG, "Import directory is empty");
Toast toast = Toast
.makeText(this, R.string.opml_import_error_dir_empty,
Toast.LENGTH_LONG);
toast.show();
}
if (fileList.length > 0) {
importWorker = new OpmlImportWorker(this, fileList[0]) {
}
}
private void startImport(File file) {
if (file != null) {
importWorker = new OpmlImportWorker(this, file) {
@Override
protected void onPostExecute(ArrayList<OpmlElement> result) {
@ -124,14 +142,34 @@ public class OpmlImportActivity extends SherlockActivity {
}
};
importWorker.executeAsync();
} else {
Log.e(TAG, "Import directory is empty");
Toast toast = Toast
.makeText(this, R.string.opml_import_error_dir_empty,
Toast.LENGTH_LONG);
toast.show();
}
}
/** Asks the user to choose from a list of files in a directory and returns his choice. */
private void askForFile(File dir) {
final File[] fileList = dir.listFiles();
String[] fileNames = dir.list();
AlertDialog.Builder dialog = new AlertDialog.Builder(this);
dialog.setTitle(R.string.choose_file_to_import_label);
dialog.setNeutralButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (AppConfig.DEBUG) Log.d(TAG, "Dialog was cancelled");
dialog.dismiss();
}});
dialog.setItems(fileNames, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (AppConfig.DEBUG) Log.d(TAG, "File at index " + which + " was chosen");
dialog.dismiss();
startImport(fileList[which]);
}
});
dialog.create().show();
}
@Override