Merge remote-tracking branch 'refs/remotes/origin/2.7.x-release'

Author: misaochan

app/src/main/java/fr/free/nrw/commons/Media.java

@@ -43,6 +43,7 @@ public Media[] newArray(int i) {
     protected String license;
     protected String creator;
     protected ArrayList<String> categories; // as loaded at runtime?
+    protected boolean requestedDeletion;
     private Map<String, String> descriptions; // multilingual descriptions as loaded
     private HashMap<String, Object> tags = new HashMap<>();
     private @Nullable LatLng coordinates;
@@ -416,4 +417,12 @@ public void writeToParcel(Parcel parcel, int flags) {
         parcel.writeStringList(categories);
         parcel.writeMap(descriptions);
     }
+
+    public void setRequestedDeletion(){
+        requestedDeletion = true;
+    }
+
+    public boolean getRequestedDeletion(){
+        return requestedDeletion;
+    }
 }

app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java

@@ -35,6 +35,7 @@
 public class MediaDataExtractor {
     private final MediaWikiApi mediaWikiApi;
     private boolean fetched;
+    private boolean deletionStatus;
     private ArrayList<String> categories;
     private Map<String, String> descriptions;
     private String license;
@@ -59,6 +60,14 @@ public void fetch(String filename, LicenseList licenseList) throws IOException {
             throw new IllegalStateException("Tried to call MediaDataExtractor.fetch() again.");
         }
 
+        try{
+            Timber.d("Nominated for deletion: " + mediaWikiApi.pageExists("Commons:Deletion_requests/"+filename));
+            deletionStatus = mediaWikiApi.pageExists("Commons:Deletion_requests/"+filename);
+        }
+        catch (Exception e){
+            Timber.d(e.getMessage());
+        }
+
         MediaResult result = mediaWikiApi.fetchMediaByFilename(filename);
 
         // In-page category links are extracted from source, as XML doesn't cover [[links]]
@@ -296,6 +305,9 @@ public void fill(Media media) {
         if (license != null) {
             media.setLicense(license);
         }
+        if (deletionStatus){
+            media.setRequestedDeletion();
+        }
 
         // add author, date, etc fields
     }

app/src/main/java/fr/free/nrw/commons/delete/DeleteTask.java

@@ -1,10 +1,13 @@
 package fr.free.nrw.commons.delete;
 
-import android.app.AlertDialog;
+import android.app.NotificationManager;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.AsyncTask;
+import android.support.v4.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat.Builder;
+import android.view.Gravity;
+import android.widget.Toast;
+
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Locale;
@@ -18,17 +21,18 @@
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import timber.log.Timber;
 
-import static android.support.v4.content.ContextCompat.startActivity;
-
-public class DeleteTask extends AsyncTask<Void, Void, Integer> {
+import static android.support.v4.app.NotificationCompat.DEFAULT_ALL;
+import static android.support.v4.app.NotificationCompat.PRIORITY_HIGH;
 
-    private static final int SUCCESS = 0;
-    private static final int FAILED = -1;
-    private static final int ALREADY_DELETED = -2;
+public class DeleteTask extends AsyncTask<Void, Integer, Boolean> {
 
     @Inject MediaWikiApi mwApi;
     @Inject SessionManager sessionManager;
 
+    public static final int NOTIFICATION_DELETE = 1;
+
+    private NotificationManager notificationManager;
+    private Builder notificationBuilder;
     private Context context;
     private Media media;
     private String reason;
@@ -45,130 +49,133 @@ protected void onPreExecute(){
                 .getInstance(context.getApplicationContext())
                 .getCommonsApplicationComponent()
                 .inject(this);
+
+        notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationBuilder = new NotificationCompat.Builder(context);
+        Toast toast = new Toast(context);
+        toast.setGravity(Gravity.CENTER,0,0);
+        toast = Toast.makeText(context,"Trying to nominate "+media.getDisplayTitle()+ " for deletion",Toast.LENGTH_SHORT);
+        toast.show();
     }
 
     @Override
-    protected Integer doInBackground(Void ...voids) {
+    protected Boolean doInBackground(Void ...voids) {
+        publishProgress(0);
+
         String editToken;
         String authCookie;
         String summary = "Nominating " + media.getFilename() +" for deletion.";
 
         authCookie = sessionManager.getAuthCookie();
         mwApi.setAuthCookie(authCookie);
 
-        try{
-            if (mwApi.pageExists("Commons:Deletion_requests/"+media.getFilename())){
-                return ALREADY_DELETED;
-            }
-        }
-        catch (Exception e) {
-            Timber.d(e.getMessage());
-            return FAILED;
-        }
-
-        try {
-            editToken = mwApi.getEditToken();
-        }
-        catch (Exception e){
-            Timber.d(e.getMessage());
-            return FAILED;
-        }
-        if (editToken.equals("+\\")) {
-            return FAILED;
-        }
-
         Calendar calendar = Calendar.getInstance();
         String fileDeleteString = "{{delete|reason=" + reason +
                 "|subpage=" +media.getFilename() +
                 "|day=" + calendar.get(Calendar.DAY_OF_MONTH) +
                 "|month=" + calendar.getDisplayName(Calendar.MONTH,Calendar.LONG, Locale.getDefault()) +
                 "|year=" + calendar.get(Calendar.YEAR) +
                 "}}";
-        try{
-            mwApi.prependEdit(editToken,fileDeleteString+"\n",
-                    media.getFilename(),summary);
-        }
-        catch (Exception e) {
-            Timber.d(e.getMessage());
-            return FAILED;
-        }
 
         String subpageString = "=== [[:" + media.getFilename() + "]] ===\n" +
                 reason +
                 " ~~~~";
-        try{
-            mwApi.edit(editToken,subpageString+"\n",
-                    "Commons:Deletion_requests/"+media.getFilename(),summary);
-        }
-        catch (Exception e) {
-            Timber.d(e.getMessage());
-            return FAILED;
-        }
 
         String logPageString = "\n{{Commons:Deletion requests/" + media.getFilename() +
                 "}}\n";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
         String date = sdf.format(calendar.getTime());
-        try{
-            mwApi.appendEdit(editToken,logPageString+"\n",
-                    "Commons:Deletion_requests/"+date,summary);
-        }
-        catch (Exception e) {
-            Timber.d(e.getMessage());
-            return FAILED;
-        }
 
         String userPageString = "\n{{subst:idw|" + media.getFilename() +
                 "}} ~~~~";
-        try{
+
+        try {
+            editToken = mwApi.getEditToken();
+            if (editToken.equals("+\\")) {
+                return false;
+            }
+            publishProgress(1);
+
+            mwApi.prependEdit(editToken,fileDeleteString+"\n",
+                    media.getFilename(),summary);
+            publishProgress(2);
+
+            mwApi.edit(editToken,subpageString+"\n",
+                    "Commons:Deletion_requests/"+media.getFilename(),summary);
+            publishProgress(3);
+
+            mwApi.appendEdit(editToken,logPageString+"\n",
+                    "Commons:Deletion_requests/"+date,summary);
+            publishProgress(4);
+
             mwApi.appendEdit(editToken,userPageString+"\n",
                     "User_Talk:"+sessionManager.getCurrentAccount().name,summary);
+            publishProgress(5);
         }
         catch (Exception e) {
             Timber.d(e.getMessage());
-            return FAILED;
+            return false;
         }
-        return SUCCESS;
+        return true;
     }
 
     @Override
-    protected void onPostExecute(Integer result) {
+    protected void onProgressUpdate (Integer... values){
+        super.onProgressUpdate(values);
+
         String message = "";
-        String title = "";
-        switch (result){
-            case SUCCESS:
-                title = "Success";
-                message = "Successfully nominated " + media.getDisplayTitle() + " deletion.\n" +
-                        "Check the webpage for more details";
+        switch (values[0]){
+            case 0:
+                message = "Getting token";
+                break;
+            case 1:
+                message = "Adding delete message to file";
                 break;
-            case FAILED:
-                title = "Failed";
-                message = "Could not request deletion. Something went wrong.";
+            case 2:
+                message = "Creating Delete requests sub-page";
                 break;
-            case ALREADY_DELETED:
-                title = "Already Nominated";
-                message = media.getDisplayTitle() + " has already been nominated for deletion.\n" +
-                        "Check the webpage for more details";
+            case 3:
+                message = "Adding file to Delete requests log";
+                break;
+            case 4:
+                message = "Notifying User on Talk page";
+                break;
+            case 5:
+                message = "Done";
                 break;
         }
-        AlertDialog alert;
-        AlertDialog.Builder builder = new AlertDialog.Builder(context);
-        builder.setTitle(title);
-        builder.setMessage(message);
-        builder.setCancelable(true);
-        builder.setPositiveButton(
-                R.string.ok,
-                new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int id) {}
-                });
-        builder.setNeutralButton(R.string.view_browser,
-                new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int id) {
-                        Intent browserIntent = new Intent(Intent.ACTION_VIEW, media.getFilePageTitle().getMobileUri());
-                        startActivity(context,browserIntent,null);
-                    }
-                });
-        alert = builder.create();
-        alert.show();
+
+        notificationBuilder.setContentTitle("Nominating "+media.getDisplayTitle()+" for deletion")
+                .setStyle(new NotificationCompat.BigTextStyle()
+                        .bigText(message))
+                .setSmallIcon(R.drawable.ic_launcher)
+                .setProgress(5, values[0], false)
+                .setOngoing(true);
+        notificationManager.notify(NOTIFICATION_DELETE, notificationBuilder.build());
+    }
+
+    @Override
+    protected void onPostExecute(Boolean result) {
+        String message = "";
+        String title = "Nominating for Deletion";
+
+        if (result){
+            title += ": Success";
+            message = "Successfully nominated " + media.getDisplayTitle() + " deletion.";
+        }
+        else {
+            title += ": Failed";
+            message = "Could not request deletion.";
+        }
+
+        notificationBuilder.setDefaults(DEFAULT_ALL)
+                .setContentTitle(title)
+                .setStyle(new NotificationCompat.BigTextStyle()
+                        .bigText(message))
+                .setSmallIcon(R.drawable.ic_launcher)
+                .setProgress(0,0,false)
+                .setOngoing(false)
+                .setPriority(PRIORITY_HIGH);
+        notificationManager.notify(NOTIFICATION_DELETE, notificationBuilder.build());
     }
 }