From 6c11044ea5736675b4ca35d0858573d49a552c18 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 9 Jun 2015 16:49:50 +0300 Subject: remove m_filename from mainactivity --- .../src/main/java/org/fox/ttcomics2/MainActivity.java | 14 ++++++-------- .../src/main/java/org/fox/ttcomics2/ViewComicActivity.java | 13 ++++++++++++- 2 files changed, 18 insertions(+), 9 deletions(-) (limited to 'org.fox.ttcomics') 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 d7ef543..e07b90b 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 @@ -2,6 +2,7 @@ package org.fox.ttcomics2; import android.annotation.SuppressLint; +import android.app.Activity; import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; @@ -25,7 +26,6 @@ public class MainActivity extends CommonActivity implements MaterialTabListener private int m_selectedTab; private String m_baseDirectory = ""; - private String m_fileName = ""; private MaterialTabHost tabHost; @SuppressLint("NewApi") @@ -60,7 +60,6 @@ public class MainActivity extends CommonActivity implements MaterialTabListener } else { m_selectedTab = -1; m_baseDirectory = savedInstanceState.getString("baseDir"); - m_fileName = savedInstanceState.getString("fileName"); } tabHost.addTab(tabHost.newTab() @@ -129,7 +128,6 @@ public class MainActivity extends CommonActivity implements MaterialTabListener out.putInt("selectedTab", m_selectedTab); out.putString("baseDir", m_baseDirectory); - out.putString("fileName", m_fileName); } public boolean onOptionsItemSelected(MenuItem item) { @@ -166,8 +164,7 @@ public class MainActivity extends CommonActivity implements MaterialTabListener ViewComicActivity.class); intent.putExtra("fileName", fileName); - m_fileName = fileName; - + startActivityForResult(intent, REQUEST_VIEWCOMIC); } else { toast(getString(R.string.error_cant_open_file, fileName)); @@ -182,12 +179,13 @@ public class MainActivity extends CommonActivity implements MaterialTabListener @Override protected void onActivityResult(int requestCode, int resultCode, Intent intent) { - if (requestCode == REQUEST_VIEWCOMIC) { - Log.d(TAG, "finished viewing comic: " + m_fileName); + if (requestCode == REQUEST_VIEWCOMIC && resultCode == Activity.RESULT_OK) { + String fileName = intent.getStringExtra("fileName"); + Log.d(TAG, "finished viewing comic: " + fileName); if (m_prefs.getBoolean("use_position_sync", false) && m_syncClient.hasOwner()) { toast(R.string.sync_uploading); - m_syncClient.setPosition(sha1(new File(m_fileName).getName()), getLastPosition(m_fileName)); + m_syncClient.setPosition(sha1(new File(fileName).getName()), getLastPosition(fileName)); } } diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java index e91f513..e93df1c 100644 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java @@ -2,6 +2,7 @@ package org.fox.ttcomics2; import android.annotation.SuppressLint; +import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.content.DialogInterface; @@ -303,7 +304,7 @@ public class ViewComicActivity extends CommonActivity { return true; case android.R.id.home: - finish(); + onBackPressed(); return true; default: Log.d(TAG, @@ -320,4 +321,14 @@ public class ViewComicActivity extends CommonActivity { } } + @Override + public void onBackPressed() { + Intent resultIntent = new Intent(); + resultIntent.putExtra("fileName", m_fileName); + + setResult(Activity.RESULT_OK, resultIntent); + + super.onBackPressed(); + } + } -- cgit v1.2.3