Revert "add basic stuff for downloading files through SAF"

This reverts commit 771cd4a9376535f0f675ae8340867b952c66bc71.

3 files changed, 2 insertions, 51 deletions

diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
index b216ceb..da2198d 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
@@ -41,7 +41,6 @@ public class CommonActivity extends ActionBarActivity {
 
 	protected final static int REQUEST_SHARE = 1;
 	protected static final int REQUEST_VIEWCOMIC = 2;
-	protected static final int REQUEST_OPEN_FILE = 3;
 
 	protected SharedPreferences m_prefs;
 	protected SyncClient m_syncClient = new SyncClient();
@@ -313,7 +312,7 @@ public class CommonActivity extends ActionBarActivity {
 	public int getCachedItemCount(String baseDir) {
 		Cursor c = getReadableDb().query("comics_cache", new String[] { "COUNT(*)" },
 				"path = ?",
-				new String[] {baseDir }, null, null, null);
+				new String[] { baseDir }, null, null, null);
 		
 		c.moveToFirst();
 		int count = c.getInt(0);
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
index eeb4d5b..bbe1f70 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
@@ -6,10 +6,8 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v4.provider.DocumentFile;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
@@ -138,16 +136,6 @@ public class MainActivity extends CommonActivity implements MaterialTabListener
     
     public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
-		case R.id.menu_open:
-			if (true) {
-				Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
-				intent.addCategory(Intent.CATEGORY_OPENABLE);
-				intent.setType("*/*");
-
-				startActivityForResult(intent, REQUEST_OPEN_FILE);
-
-			}
-			return true;
 		case android.R.id.home:
 			if (m_baseDirectory.length() > 0) {
 				finish();
@@ -193,38 +181,8 @@ public class MainActivity extends CommonActivity implements MaterialTabListener
 		}
 	}
 
-	protected void downloadRemoteFile(DocumentFile file) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setMessage("File will be cached locally. Data charges may apply.")
-				.setTitle(file.getName())
-				.setCancelable(true)
-				.setPositiveButton("Continue", new DialogInterface.OnClickListener() {
-					public void onClick(DialogInterface dialog, int id) {
-						// launch preferences
-
-					}
-				})
-				.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-					public void onClick(DialogInterface dialog, int id) {
-						dialog.cancel();
-					}
-				});
-		AlertDialog alert = builder.create();
-		alert.show();
-	}
-
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
-		if (requestCode == REQUEST_OPEN_FILE && resultCode == Activity.RESULT_OK) {
-			Uri docUri = intent.getData();
-			DocumentFile file = DocumentFile.fromSingleUri(this, docUri);
-
-			Log.d(TAG, "got file=" + file);
-
-			downloadRemoteFile(file);
-
-		}
-
 	    if (requestCode == REQUEST_VIEWCOMIC && resultCode == Activity.RESULT_OK) {
 			String fileName = intent.getStringExtra("fileName");
 	    	Log.d(TAG, "finished viewing comic: " + fileName);
diff --git a/org.fox.ttcomics/src/main/res/menu/activity_main.xml b/org.fox.ttcomics/src/main/res/menu/activity_main.xml
index da28c3d..1143a47 100644
--- a/org.fox.ttcomics/src/main/res/menu/activity_main.xml
+++ b/org.fox.ttcomics/src/main/res/menu/activity_main.xml
@@ -5,13 +5,7 @@
         android:title="@string/menu_rescan"
         android:icon="@drawable/ic_refresh"
         app:showAsAction="ifRoom" /> -->
-
-    <item android:id="@+id/menu_open"
-        android:title="Open file"
-        android:icon="@drawable/ic_file_document_box"
-        app:showAsAction="ifRoom"
-        />
-
+    
     <item android:id="@+id/menu_settings"
         android:title="@string/menu_settings"
         android:icon="@drawable/ic_settings"