From 71d588aad6abd38df32ef1f69ab9abdbc58eefeb Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 14 Oct 2012 10:55:26 +0400
Subject: add several error notifications

---
 src/org/fox/ttcomics/ComicPager.java        |  4 +---
 src/org/fox/ttcomics/CommonActivity.java    | 12 ++++++++++++
 src/org/fox/ttcomics/ViewComicActivity.java |  8 +-------
 3 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/org/fox/ttcomics/ComicPager.java b/src/org/fox/ttcomics/ComicPager.java
index 233fa59..9e00c8c 100644
--- a/src/org/fox/ttcomics/ComicPager.java
+++ b/src/org/fox/ttcomics/ComicPager.java
@@ -113,9 +113,7 @@ public class ComicPager extends Fragment {
 			m_activity.onComicSelected(m_fileName, position);
 			
 		} catch (IOException e) {
-			
-			// TODO Can't open comic, display error...
-			
+			m_activity.toast(R.string.error_could_not_open_comic_archive);
 			e.printStackTrace();
 		}
 		
diff --git a/src/org/fox/ttcomics/CommonActivity.java b/src/org/fox/ttcomics/CommonActivity.java
index c0a2d01..97147d9 100644
--- a/src/org/fox/ttcomics/CommonActivity.java
+++ b/src/org/fox/ttcomics/CommonActivity.java
@@ -15,6 +15,7 @@ import android.util.Log;
 import android.view.Display;
 import android.view.MenuItem;
 import android.widget.ShareActionProvider;
+import android.widget.Toast;
 
 public class CommonActivity extends FragmentActivity {
 	private final String TAG = this.getClass().getSimpleName();
@@ -159,4 +160,15 @@ public class CommonActivity extends FragmentActivity {
 		
 		return file.getAbsolutePath();
 	}
+	
+	public void toast(int msgId) {
+		Toast toast = Toast.makeText(CommonActivity.this, msgId, Toast.LENGTH_SHORT);
+		toast.show();
+	}
+
+	public void toast(String msg) {
+		Toast toast = Toast.makeText(CommonActivity.this, msg, Toast.LENGTH_SHORT);
+		toast.show();
+	}
+
 }
diff --git a/src/org/fox/ttcomics/ViewComicActivity.java b/src/org/fox/ttcomics/ViewComicActivity.java
index b0d6db2..0d8fedd 100644
--- a/src/org/fox/ttcomics/ViewComicActivity.java
+++ b/src/org/fox/ttcomics/ViewComicActivity.java
@@ -25,7 +25,6 @@ public class ViewComicActivity extends CommonActivity {
 	private final String TAG = this.getClass().getSimpleName();
 
 	private String m_fileName;
-	private Menu m_menu;
 	
     @SuppressLint("NewApi")
 	@Override
@@ -60,10 +59,6 @@ public class ViewComicActivity extends CommonActivity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.activity_view_comic, menu);
-        
-        m_menu = menu;
-		
-		//updateMenu();
         return true;
     }
     
@@ -77,8 +72,6 @@ public class ViewComicActivity extends CommonActivity {
 	@Override
 	public void onComicSelected(String fileName, int position) {
 		super.onComicSelected(fileName, position);
-		
-    	//updateMenu();
 	}
 	
 	private void shareComic() {
@@ -110,6 +103,7 @@ public class ViewComicActivity extends CommonActivity {
 				startActivity(Intent.createChooser(shareIntent, "Share comic"));
 
 			} catch (IOException e) {
+				toast(getString(R.string.error_could_not_prepare_file_for_sharing));
 				e.printStackTrace();
 			}
 
-- 
cgit v1.2.3