From a6c8687a13dcff9ae9e54b396b3cf58a7d0a57f7 Mon Sep 17 00:00:00 2001
From: Sadique Ali <sadiqalikm@gmail.com>
Date: Sun, 21 Jul 2013 10:31:03 -0700
Subject: [PATCH] Better error handling. Share the original content if not a
 URL.

---
 ShareWithTitle/src/main/AndroidManifest.xml    |  8 ++++----
 .../sdqali/sharewithtitle/ReshareCallback.java | 18 ++++++++++++++----
 .../sharewithtitle/TitleGrabCallback.java      |  2 +-
 .../sdqali/sharewithtitle/TitleRetriever.java  |  3 +--
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/ShareWithTitle/src/main/AndroidManifest.xml b/ShareWithTitle/src/main/AndroidManifest.xml
index 1d8910a..e722987 100644
--- a/ShareWithTitle/src/main/AndroidManifest.xml
+++ b/ShareWithTitle/src/main/AndroidManifest.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="in.sdqali.sharewithtitle"
-    android:versionCode="2"
-    android:versionName="1.1" >
+    android:versionCode="3"
+    android:versionName="1.15" >
 
     <uses-permission android:name="android.permission.INTERNET"></uses-permission>
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="16" />
+        android:minSdkVersion="11"
+        android:targetSdkVersion="18" />
 
     <application
         android:allowBackup="true"
diff --git a/ShareWithTitle/src/main/java/in/sdqali/sharewithtitle/ReshareCallback.java b/ShareWithTitle/src/main/java/in/sdqali/sharewithtitle/ReshareCallback.java
index acf61d1..8dd7b01 100644
--- a/ShareWithTitle/src/main/java/in/sdqali/sharewithtitle/ReshareCallback.java
+++ b/ShareWithTitle/src/main/java/in/sdqali/sharewithtitle/ReshareCallback.java
@@ -23,7 +23,13 @@ public class ReshareCallback implements TitleGrabCallback{
     @Override
     public void onSuccess(String titleAndLink) {
         progressBar.setVisibility(View.VISIBLE);
-        Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
+        showToast("Successfully grabbed title!");
+        reShare(titleAndLink);
+        cleanUp();
+    }
+
+    private void reShare(String titleAndLink) {
+        Intent sharingIntent = new Intent(Intent.ACTION_SEND);
 
         sharingIntent.setType("text/plain");
         sharingIntent.putExtra(Intent.EXTRA_TEXT, titleAndLink);
@@ -41,11 +47,15 @@ public class ReshareCallback implements TitleGrabCallback{
     }
 
     @Override
-    public void showError(String errorMessage) {
+    public void showError(String errorMessage, String urlText) {
+        showToast(errorMessage);
+        reShare(urlText);
+        cleanUp();
+    }
+
+    private void showToast(String errorMessage) {
         int duration = Toast.LENGTH_SHORT;
         Toast toast = Toast.makeText(activity.getApplicationContext(), errorMessage, duration);
         toast.show();
-        progressBar.setVisibility(View.GONE);
-        activity.finish();
     }
 }
diff --git a/ShareWithTitle/src/main/java/in/sdqali/sharewithtitle/TitleGrabCallback.java b/ShareWithTitle/src/main/java/in/sdqali/sharewithtitle/TitleGrabCallback.java
index c2e41df..995b308 100644
--- a/ShareWithTitle/src/main/java/in/sdqali/sharewithtitle/TitleGrabCallback.java
+++ b/ShareWithTitle/src/main/java/in/sdqali/sharewithtitle/TitleGrabCallback.java
@@ -7,5 +7,5 @@ public interface TitleGrabCallback {
     public void onSuccess(String title);
     public void onProgress();
     public void cleanUp();
-    public void showError(String errorMessage);
+    public void showError(String errorMessage, String urlText);
 }
diff --git a/ShareWithTitle/src/main/java/in/sdqali/sharewithtitle/TitleRetriever.java b/ShareWithTitle/src/main/java/in/sdqali/sharewithtitle/TitleRetriever.java
index 6ee7648..d01697d 100644
--- a/ShareWithTitle/src/main/java/in/sdqali/sharewithtitle/TitleRetriever.java
+++ b/ShareWithTitle/src/main/java/in/sdqali/sharewithtitle/TitleRetriever.java
@@ -17,7 +17,7 @@ public class TitleRetriever {
         if(isValidUrl(urlText)) {
             new DownloadTaskNew(callback).execute(urlText);
         } else {
-            callback.showError("Not a valid url. Could not load title!");
+            callback.showError("Not a valid url. Could not load title!", urlText);
         }
     }
 
@@ -47,7 +47,6 @@ public class TitleRetriever {
                 output = title + " " + urlText;
             }
             callback.onSuccess(output);
-            callback.cleanUp();
         }
     }
 }