From 8990f79059faa86b8e1eed8734ebf812d1ab01e7 Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 15 Dec 2016 15:12:51 +1300 Subject: [PATCH] Add context to constructor, copy AlertDialog code --- .../nrw/commons/upload/ExistingFileAsync.java | 36 +++++++++++++++++-- .../nrw/commons/upload/ShareActivity.java | 2 +- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java b/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java index b3de0a913..0dea8d524 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java @@ -1,6 +1,8 @@ package fr.free.nrw.commons.upload; +import android.content.Context; +import android.content.DialogInterface; import android.os.AsyncTask; import android.util.Log; @@ -10,6 +12,8 @@ import org.mediawiki.api.MWApi; import java.io.IOException; import java.util.ArrayList; +import android.support.v7.app.AlertDialog; + import fr.free.nrw.commons.CommonsApplication; /** @@ -19,16 +23,22 @@ import fr.free.nrw.commons.CommonsApplication; public class ExistingFileAsync extends AsyncTask { private static final String TAG = fr.free.nrw.commons.upload.ExistingFileAsync.class.getName(); - private String fileSHA1; - public ExistingFileAsync(String fileSHA1) { + private String fileSHA1; + private Context context; + + private AlertDialog alertDialog; + + public ExistingFileAsync(String fileSHA1, Context context) { super(); this.fileSHA1 = fileSHA1; + this.context = context; } @Override protected void onPreExecute() { super.onPreExecute(); + alertDialog = new AlertDialog.Builder(ExistingFileAsync.this); } @Override @@ -67,5 +77,27 @@ public class ExistingFileAsync extends AsyncTask { protected void onPostExecute(Boolean fileExists) { super.onPostExecute(fileExists); //TODO: Add Dialog here to tell user file exists, do you want to continue? Yes/No + + alertDialog.setTitle("The Process"); + alertDialog.setIcon(R.drawable.success); + alertDialog.setCanceledOnTouchOutside(false); + alertDialog.setMessage("All done!"); + alertDialog.setButton(AlertDialog.BUTTON_NEUTRAL, "OK", + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + Intent A = new Intent(DownloadActivity.this, Menu_activity.class); + startActivity(A); + finish(); + } + }); + alertDialog.setOnDismissListener(new DialogInterface.OnDismissListener() { + @Override + public void onDismiss(DialogInterface dialog) { + Intent A = new Intent(DownloadActivity.this, Menu_activity.class); + startActivity(A); + finish(); + } + }); + alertDialog.show(); } } \ No newline at end of file diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java index d4d7c2021..bce4566df 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java @@ -251,7 +251,7 @@ public class ShareActivity //FIXME: Replace hardcoded string with call to Commons API instead (use TitleCategories.java as template) - ExistingFileAsync fileAsyncTask = new ExistingFileAsync(fileSHA1); + ExistingFileAsync fileAsyncTask = new ExistingFileAsync(fileSHA1, this); fileAsyncTask.execute(); } catch (IOException e) {