diff options
author | Andrew Dolgov <[email protected]> | 2015-06-09 17:49:21 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-06-09 17:49:21 +0300 |
commit | b0c6dc1089dd1f14e27ffc403cb28a21222e7c7b (patch) | |
tree | a0ad37d7555791d7d610e9adb58e16647f2aa98c /org.fox.ttcomics/src/main/java/org | |
parent | 613c30b753998bc6d82bc1a00dc423640a5b9404 (diff) |
Revert "add basic stuff for downloading files through SAF"
This reverts commit 771cd4a9376535f0f675ae8340867b952c66bc71.
Diffstat (limited to 'org.fox.ttcomics/src/main/java/org')
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java | 3 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java | 42 |
2 files changed, 1 insertions, 44 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); |