get correct paste address; display error/success alert dialogs

1 files changed, 24 insertions, 5 deletions

diff --git a/src/eu/deki/paste/PasteTask.java b/src/eu/deki/paste/PasteTask.java
index 29b5c32..4a634e5 100644
--- a/src/eu/deki/paste/PasteTask.java
+++ b/src/eu/deki/paste/PasteTask.java
@@ -2,13 +2,14 @@ package eu.deki.paste;
 
 import java.io.IOException;
 import android.os.AsyncTask;
-import android.widget.Toast;
 import android.content.Context;
+import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
 import android.util.Log;
 
 public abstract class PasteTask extends AsyncTask<String, Void, String>
 {
-    private String errorMessage = null;
+    private String errorMessage = "Fail";
     protected Context parentActivity = null;
 
     public PasteTask(Context parent)
@@ -29,9 +30,18 @@ public abstract class PasteTask extends AsyncTask<String, Void, String>
 	content = params[1];
 	expiration = params[2];
 
+	if(content.length() == 0)
+	{
+	    errorMessage = parentActivity.getResources().getString(R.string.contentTooShort);
+	    cancel(false);
+	    return null;
+	}
+
 	try
 	{
 	    result = paste(title, content, expiration);
+	    if(result == null)
+		cancel(false);
 	}
 	catch(IOException ex)
 	{
@@ -47,14 +57,23 @@ public abstract class PasteTask extends AsyncTask<String, Void, String>
     @Override
     protected void onPostExecute(String result)
     {
-
+	AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity);
+	String message = String.format(parentActivity.getResources().getString(R.string.pasteSuccessMessage), result);
+	builder.setMessage(message);
+	builder.setTitle(R.string.pasteSuccessTitle);
+	builder.setPositiveButton("OK", null);
+	builder.create().show();
     }
 
     @Override
     protected void onCancelled()
     {
-	//Toast toast = Toast.makeText(parentActivity.getApplicationContext(), errorMessage, Toast.LENGTH_SHORT);
-	//toast.show();
+	AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity);
+	String message = String.format(parentActivity.getResources().getString(R.string.pasteFailMessage), errorMessage);
+	builder.setMessage(message);
+	builder.setTitle(R.string.pasteFailTitle);
+	builder.setPositiveButton("OK", null);
+	builder.create().show();
     }
 
     protected abstract String paste(String title, String content, String delay) throws IOException;