From b9d8e859a83b9f8105a55fc9a7e6fb185872087b Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 28 Jul 2016 16:13:15 +1200 Subject: [PATCH 1/9] Prevent upload for debugging --- .../main/java/fr/free/nrw/commons/upload/UploadController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java index ee6be3007..99be33a57 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java @@ -170,7 +170,7 @@ public class UploadController { @Override protected void onPostExecute(Contribution contribution) { super.onPostExecute(contribution); - uploadService.queue(UploadService.ACTION_UPLOAD_FILE, contribution); + //uploadService.queue(UploadService.ACTION_UPLOAD_FILE, contribution); onComplete.onUploadStarted(contribution); } }); From 7f90ca43ebd2394477731234cd271eb20c8af732 Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 28 Jul 2016 16:16:47 +1200 Subject: [PATCH 2/9] Add onKeyListener to rootView --- .../category/CategorizationFragment.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index 3b2005172..1297426e4 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -14,6 +14,7 @@ import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; import android.util.Log; +import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; @@ -26,6 +27,7 @@ import android.widget.EditText; import android.widget.ListView; import android.widget.ProgressBar; import android.widget.TextView; +import android.widget.Toast; import java.util.ArrayList; import java.util.Date; @@ -447,6 +449,28 @@ public class CategorizationFragment extends Fragment { client = getActivity().getContentResolver().acquireContentProviderClient(CategoryContentProvider.AUTHORITY); } + @Override + public void onResume() { + super.onResume(); + + View rootView = getView(); + if (rootView != null) { + rootView.setFocusableInTouchMode(true); + rootView.requestFocus(); + rootView.setOnKeyListener(new View.OnKeyListener() { + @Override + public boolean onKey(View v, int keyCode, KeyEvent event) { + if (event.getAction() == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) { + // handle back button's click listener + Toast.makeText(getActivity(), "Back press", Toast.LENGTH_SHORT).show(); + return true; + } + return false; + } + }); + } + } + @Override public void onDestroy() { super.onDestroy(); From 5aa538bbe87f61efead264c64dfad7efb0a98b7d Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 28 Jul 2016 16:25:40 +1200 Subject: [PATCH 3/9] Add dialog --- .../category/CategorizationFragment.java | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index 1297426e4..063a68e9a 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -3,6 +3,7 @@ package fr.free.nrw.commons.category; import android.app.Activity; import android.content.ContentProviderClient; import android.content.Context; +import android.content.DialogInterface; import android.database.Cursor; import android.os.AsyncTask; import android.os.Bundle; @@ -10,6 +11,7 @@ import android.os.Parcel; import android.os.Parcelable; import android.os.RemoteException; import android.support.v4.app.Fragment; +import android.support.v7.app.AlertDialog; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; @@ -463,14 +465,37 @@ public class CategorizationFragment extends Fragment { if (event.getAction() == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) { // handle back button's click listener Toast.makeText(getActivity(), "Back press", Toast.LENGTH_SHORT).show(); + backButtonDialog(); return true; + } else { + return false; } - return false; } }); } } + private void backButtonDialog() { + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + + builder.setMessage("Are you sure you want to leave? The image will not have any categories saved.") + .setTitle("Warning"); + + builder.setPositiveButton("Yes", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // User clicked OK button + } + }); + builder.setNegativeButton("No", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // User cancelled the dialog + } + }); + + AlertDialog dialog = builder.create(); + dialog.show(); + } + @Override public void onDestroy() { super.onDestroy(); From d5590c9cdd6f5ed901615458ef3e6c64a527b855 Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 28 Jul 2016 16:27:46 +1200 Subject: [PATCH 4/9] Minor changes --- .../nrw/commons/category/CategorizationFragment.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index 063a68e9a..b11d95356 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -463,8 +463,6 @@ public class CategorizationFragment extends Fragment { @Override public boolean onKey(View v, int keyCode, KeyEvent event) { if (event.getAction() == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) { - // handle back button's click listener - Toast.makeText(getActivity(), "Back press", Toast.LENGTH_SHORT).show(); backButtonDialog(); return true; } else { @@ -478,17 +476,14 @@ public class CategorizationFragment extends Fragment { private void backButtonDialog() { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); - builder.setMessage("Are you sure you want to leave? The image will not have any categories saved.") + builder.setMessage("Are you sure you want to go back? The image will not have any categories saved.") .setTitle("Warning"); - - builder.setPositiveButton("Yes", new DialogInterface.OnClickListener() { + builder.setPositiveButton("No", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { - // User clicked OK button } }); - builder.setNegativeButton("No", new DialogInterface.OnClickListener() { + builder.setNegativeButton("Yes", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { - // User cancelled the dialog } }); From 186a39af247a6dd65e70fb8ac56ccf5b7d9e304a Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 28 Jul 2016 16:29:05 +1200 Subject: [PATCH 5/9] Add todo --- .../fr/free/nrw/commons/category/CategorizationFragment.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index b11d95356..5b1fc3eec 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -480,10 +480,12 @@ public class CategorizationFragment extends Fragment { .setTitle("Warning"); builder.setPositiveButton("No", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { + //No need to do anything, user remains on categorization screen } }); builder.setNegativeButton("Yes", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { + //TODO: Actually go back } }); From be5f4f96eab87133f4f0665af70557f91627934f Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 28 Jul 2016 16:31:15 +1200 Subject: [PATCH 6/9] Modify returns --- .../fr/free/nrw/commons/category/CategorizationFragment.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index 5b1fc3eec..b486ea1a6 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -465,9 +465,8 @@ public class CategorizationFragment extends Fragment { if (event.getAction() == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) { backButtonDialog(); return true; - } else { - return false; } + return false; } }); } From 92c1981591e8dce761bc14556598264ccf5ec40d Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 28 Jul 2016 16:40:20 +1200 Subject: [PATCH 7/9] Finish activity if user presses 'yes' --- .../fr/free/nrw/commons/category/CategorizationFragment.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index b486ea1a6..b02a6fe3c 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -485,6 +485,7 @@ public class CategorizationFragment extends Fragment { builder.setNegativeButton("Yes", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { //TODO: Actually go back + getActivity().finish(); } }); From b66aa15ab134e9d3d1dfc506091a0ccea22f6eb8 Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 28 Jul 2016 16:41:15 +1200 Subject: [PATCH 8/9] Revert "Prevent upload for debugging" This reverts commit b9d8e859a83b9f8105a55fc9a7e6fb185872087b. --- .../main/java/fr/free/nrw/commons/upload/UploadController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java index 99be33a57..ee6be3007 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java @@ -170,7 +170,7 @@ public class UploadController { @Override protected void onPostExecute(Contribution contribution) { super.onPostExecute(contribution); - //uploadService.queue(UploadService.ACTION_UPLOAD_FILE, contribution); + uploadService.queue(UploadService.ACTION_UPLOAD_FILE, contribution); onComplete.onUploadStarted(contribution); } }); From 8a3fae27da47520dc01cc993640de9bf1c370a44 Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 28 Jul 2016 16:44:30 +1200 Subject: [PATCH 9/9] Minor changes --- .../fr/free/nrw/commons/category/CategorizationFragment.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index b02a6fe3c..02378e661 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -484,7 +484,6 @@ public class CategorizationFragment extends Fragment { }); builder.setNegativeButton("Yes", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { - //TODO: Actually go back getActivity().finish(); } });