From c481502332a04c65f11f02a66e65529b827f7781 Mon Sep 17 00:00:00 2001 From: Vasiliy Bout Date: Thu, 11 Mar 2010 11:26:25 +0000 Subject: [PATCH] onNewIntent(Intent) method has been added to ZLAndroidActivity git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@1094 6a642e6f-84f6-412e-ac94-c4a38d5a04b0 --- AndroidManifest.xml | 2 +- AndroidManifest.xml.pattern | 2 +- src/org/geometerplus/android/fbreader/BookDownloader.java | 6 +++--- src/org/geometerplus/android/fbreader/FBReader.java | 5 +++++ .../zlibrary/ui/android/library/ZLAndroidActivity.java | 6 ++++++ 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 68b3fb70f..c1296d7e2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -6,7 +6,7 @@ - + diff --git a/AndroidManifest.xml.pattern b/AndroidManifest.xml.pattern index e5a8f31b0..9e27539a6 100644 --- a/AndroidManifest.xml.pattern +++ b/AndroidManifest.xml.pattern @@ -6,7 +6,7 @@ - + diff --git a/src/org/geometerplus/android/fbreader/BookDownloader.java b/src/org/geometerplus/android/fbreader/BookDownloader.java index d9ca39a87..f90ae3c78 100644 --- a/src/org/geometerplus/android/fbreader/BookDownloader.java +++ b/src/org/geometerplus/android/fbreader/BookDownloader.java @@ -146,11 +146,11 @@ public class BookDownloader extends Activity { private void runFBReader(final File file) { finish(); - final Activity oldActivity = org.geometerplus.android.fbreader.FBReader.Instance; + /*final Activity oldActivity = org.geometerplus.android.fbreader.FBReader.Instance; if (oldActivity != null) { oldActivity.finish(); - } - startActivity(new Intent(Intent.ACTION_VIEW, Uri.fromFile(file), this, FBReader.class)); + }*/ + startActivity(new Intent(Intent.ACTION_VIEW, Uri.fromFile(file), this, FBReader.class).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)); } private void startFileDownload(final String uriString, final File file) { diff --git a/src/org/geometerplus/android/fbreader/FBReader.java b/src/org/geometerplus/android/fbreader/FBReader.java index 07e2ddca7..16fe25ca1 100644 --- a/src/org/geometerplus/android/fbreader/FBReader.java +++ b/src/org/geometerplus/android/fbreader/FBReader.java @@ -62,6 +62,7 @@ public class FBReader extends ZLAndroidActivity { @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); + System.err.println("FBREADER -- ON CREATE"); /* android.telephony.TelephonyManager tele = (android.telephony.TelephonyManager)getSystemService(TELEPHONY_SERVICE); @@ -83,6 +84,7 @@ public class FBReader extends ZLAndroidActivity { @Override public void onStart() { super.onStart(); + System.err.println("FBREADER -- ON START"); final ZLAndroidApplication application = ZLAndroidApplication.Instance(); final int fullScreenFlag = @@ -119,6 +121,7 @@ public class FBReader extends ZLAndroidActivity { @Override public void onResume() { super.onResume(); + System.err.println("FBREADER -- ON RESUME"); if (myPanel.ControlPanel != null) { myPanel.ControlPanel.setVisibility(myPanel.Visible ? View.VISIBLE : View.GONE); } @@ -134,6 +137,7 @@ public class FBReader extends ZLAndroidActivity { @Override public void onPause() { + System.err.println("FBREADER -- ON PAUSE"); if (myWakeLock != null) { myWakeLock.release(); } @@ -145,6 +149,7 @@ public class FBReader extends ZLAndroidActivity { @Override public void onStop() { + System.err.println("FBREADER -- ON STOP"); if (myPanel.ControlPanel != null) { myPanel.ControlPanel.hide(false); myPanel.ControlPanel = null; diff --git a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java index b92556021..1498cbd8f 100644 --- a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java +++ b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java @@ -73,6 +73,12 @@ public abstract class ZLAndroidActivity extends Activity { super.onPause(); } + @Override + public void onNewIntent(Intent intent) { + super.onNewIntent(intent); + System.err.println("FBREADER -- ON NEW INTENT"); + } + private static ZLAndroidLibrary getLibrary() { return (ZLAndroidLibrary)ZLAndroidLibrary.Instance(); }