Bugfix/uploads

app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.java

@@ -1,22 +1,19 @@
 package fr.free.nrw.commons.category;
 
 import android.text.TextUtils;
-
+import fr.free.nrw.commons.kvstore.JsonKvStore;
+import fr.free.nrw.commons.mwapi.MediaWikiApi;
+import fr.free.nrw.commons.upload.GpsCategoryModel;
+import fr.free.nrw.commons.utils.StringSortingUtils;
+import io.reactivex.Observable;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
-
 import javax.inject.Inject;
 import javax.inject.Named;
-
-import fr.free.nrw.commons.kvstore.JsonKvStore;
-import fr.free.nrw.commons.mwapi.MediaWikiApi;
-import fr.free.nrw.commons.upload.GpsCategoryModel;
-import fr.free.nrw.commons.utils.StringSortingUtils;
-import io.reactivex.Observable;
 import timber.log.Timber;
 
 /**
@@ -107,11 +104,14 @@ boolean cacheContainsKey(String term) {
      * @return
      */
     public Observable<CategoryItem> searchAll(String term, List<String> imageTitleList) {
-        //If user hasn't typed anything in yet, get GPS and recent items
+        //If query text is empty, show him category based on gps and title and recent searches
         if (TextUtils.isEmpty(term)) {
-            return gpsCategories()
-                    .concatWith(titleCategories(imageTitleList))
-                    .concatWith(recentCategories());
+            Observable<CategoryItem> categoryItemObservable = gpsCategories()
+                    .concatWith(titleCategories(imageTitleList));
+            if (hasDirectCategories()) {
+                categoryItemObservable.concatWith(directCategories().concatWith(recentCategories()));
+            }
+            return categoryItemObservable;
         }
 
         //if user types in something that is in cache, return cached category
@@ -126,18 +126,6 @@ public Observable<CategoryItem> searchAll(String term, List<String> imageTitleLi
                 .map(name -> new CategoryItem(name, false));
     }
 
-    public Observable<CategoryItem> searchCategories(String term, List<String> imageTitleList) {
-        //If user hasn't typed anything in yet, get GPS and recent items
-        if (TextUtils.isEmpty(term)) {
-            return gpsCategories()
-                    .concatWith(titleCategories(imageTitleList))
-                    .concatWith(recentCategories());
-        }
-
-        return mwApi
-                .searchCategories(term, SEARCH_CATS_LIMIT)
-                .map(s -> new CategoryItem(s, false));
-    }
 
     /**
      * Returns cached categories
@@ -148,27 +136,6 @@ private ArrayList<String> getCachedCategories(String term) {
         return categoriesCache.get(term);
     }
 
-    /**
-     * Returns default categories
-     * @param titleList
-     * @return
-     */
-    public Observable<CategoryItem> defaultCategories(List<String> titleList) {
-        Observable<CategoryItem> directCat = directCategories();
-        if (hasDirectCategories()) {
-            Timber.d("Image has direct Cat");
-            return directCat
-                    .concatWith(gpsCategories())
-                    .concatWith(titleCategories(titleList))
-                    .concatWith(recentCategories());
-        } else {
-            Timber.d("Image has no direct Cat");
-            return gpsCategories()
-                    .concatWith(titleCategories(titleList))
-                    .concatWith(recentCategories());
-        }
-    }
-
     /**
      * Returns if we have a category in DirectKV Store
      * @return

app/src/main/java/fr/free/nrw/commons/repository/UploadRemoteDataSource.java

@@ -105,27 +105,6 @@ public Observable<CategoryItem> searchAll(String query, List<String> imageTitleL
         return categoriesModel.searchAll(query, imageTitleList);
     }
 
-    /**
-     * searchCategories from MWApi
-     *
-     * @param query
-     * @param imageTitleList
-     * @return
-     */
-    public Observable<CategoryItem> searchCategories(String query, List<String> imageTitleList) {
-        return categoriesModel.searchCategories(query, imageTitleList);
-    }
-
-    /**
-     * returns the list of default categoies
-     *
-     * @param imageTitleList
-     * @return
-     */
-    public Observable<CategoryItem> defaultCategories(List<String> imageTitleList) {
-        return categoriesModel.defaultCategories(imageTitleList);
-    }
-
     /**
      * returns the string list of categories
      *

app/src/main/java/fr/free/nrw/commons/repository/UploadRepository.java

@@ -93,27 +93,6 @@ public Observable<CategoryItem> searchAll(String query, List<String> imageTitleL
         return remoteDataSource.searchAll(query, imageTitleList);
     }
 
-    /**
-     * searchCategories from MWApi
-     *
-     * @param query
-     * @param imageTitleList
-     * @return
-     */
-    public Observable<CategoryItem> searchCategories(String query, List<String> imageTitleList) {
-        return remoteDataSource.searchCategories(query, imageTitleList);
-    }
-
-    /**
-     * returns the default categorories for the list of images based on their titles
-     *
-     * @param imageTitleList
-     * @return
-     */
-    public Observable<CategoryItem> defaultCategories(List<String> imageTitleList) {
-        return remoteDataSource.defaultCategories(imageTitleList);
-    }
-
     /**
      * returns the string list of categories
      *

app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java

@@ -331,7 +331,6 @@ public int getTotalNumberOfSteps() {
             }
 
             uploadCategoriesFragment = new UploadCategoriesFragment();
-            uploadCategoriesFragment.setMediaTitleList(presenter.getImageTitleList());
             uploadCategoriesFragment.setCallback(this);
 
             mediaLicenseFragment = new MediaLicenseFragment();

app/src/main/java/fr/free/nrw/commons/upload/UploadContract.java

@@ -35,8 +35,6 @@ public interface UserActionListener extends BasePresenter<View> {
 
         void handleSubmit();
 
-        List<String> getImageTitleList();
-
         void deletePictureAtIndex(int index);
     }
 }

app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java

@@ -86,16 +86,6 @@ public void onComplete() {
         }
     }
 
-    public List<String> getImageTitleList() {
-        List<String> titleList = new ArrayList<>();
-        for (UploadItem item : repository.getUploads()) {
-            if (item.getTitle().isSet()) {
-                titleList.add(item.getTitle().toString());
-            }
-        }
-        return titleList;
-    }
-
     @Override
     public void deletePictureAtIndex(int index) {
         List<UploadableFile> uploadableFiles = view.getUploadableFiles();

app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesContract.java

@@ -1,7 +1,6 @@
 package fr.free.nrw.commons.upload.categories;
 
 import fr.free.nrw.commons.BasePresenter;
-import fr.free.nrw.commons.category.CategoryClickedListener;
 import fr.free.nrw.commons.category.CategoryItem;
 
 import java.util.List;
@@ -32,7 +31,7 @@ public interface View {
 
     public interface UserActionListener extends BasePresenter<View> {
 
-        void searchForCategories(String query, List<String> imageTitleList);
+        void searchForCategories(String query);
 
         void verifyCategories();
 

app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.java

@@ -4,23 +4,20 @@
 import static fr.free.nrw.commons.di.CommonsApplicationModule.MAIN_THREAD;
 
 import android.text.TextUtils;
-
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.category.CategoryItem;
 import fr.free.nrw.commons.repository.UploadRepository;
+import fr.free.nrw.commons.upload.UploadModel.UploadItem;
 import io.reactivex.Observable;
 import io.reactivex.Scheduler;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
-
 import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
-
 import timber.log.Timber;
 
 /**
@@ -64,14 +61,14 @@ public void onDetachView() {
 
     /**
      * asks the repository to fetch categories for the query
+     *  @param query
      *
-     * @param query
-     * @param imageTitleList
      */
     @Override
-    public void searchForCategories(String query, List<String> imageTitleList) {
+    public void searchForCategories(String query) {
         List<CategoryItem> categoryItems = new ArrayList<>();
-        Disposable searchCategoriesDisposable = Observable
+        List<String> imageTitleList = getImageTitleList();
+        Observable<CategoryItem> distinctCategoriesObservable = Observable
                 .fromIterable(repository.getSelectedCategories())
                 .subscribeOn(ioScheduler)
                 .observeOn(mainThreadScheduler)
@@ -83,14 +80,13 @@ public void searchForCategories(String query, List<String> imageTitleList) {
                 .observeOn(ioScheduler)
                 .concatWith(
                         repository.searchAll(query, imageTitleList)
-                                .mergeWith(repository.searchCategories(query, imageTitleList))
-                                .concatWith(TextUtils.isEmpty(query)
-                                        ? repository.defaultCategories(imageTitleList)
-                                        : Observable.empty())
                 )
                 .filter(categoryItem -> !repository.containsYear(categoryItem.getName()))
-                .distinct()
-                .sorted(repository.sortBySimilarity(query))
+                .distinct();
+                if(!TextUtils.isEmpty(query)) {
+                distinctCategoriesObservable=distinctCategoriesObservable.sorted(repository.sortBySimilarity(query));
+                }
+        Disposable searchCategoriesDisposable = distinctCategoriesObservable
                 .observeOn(mainThreadScheduler)
                 .subscribe(
                         s -> categoryItems.add(s),
@@ -108,6 +104,20 @@ public void searchForCategories(String query, List<String> imageTitleList) {
         compositeDisposable.add(searchCategoriesDisposable);
     }
 
+    /**
+     * Returns image title list from UploadItem
+     * @return
+     */
+    private List<String> getImageTitleList() {
+        List<String> titleList = new ArrayList<>();
+        for (UploadItem item : repository.getUploads()) {
+            if (item.getTitle().isSet()) {
+                titleList.add(item.getTitle().toString());
+            }
+        }
+        return titleList;
+    }
+
     /**
      * Verifies the number of categories selected, prompts the user if none selected
      */

app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java

@@ -49,8 +49,10 @@ public class UploadCategoriesFragment extends UploadBaseFragment implements Cate
     @Inject
     CategoriesContract.UserActionListener presenter;
     private RVRendererAdapter<CategoryItem> adapter;
-    private List<String> mediaTitleList;
+    private List<String> mediaTitleList=new ArrayList<>();
     private Disposable subscribe;
+    private List<CategoryItem> categories;
+    private boolean isVisible;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -82,7 +84,14 @@ private void init() {
         initRecyclerView();
         addTextChangeListenerToEtSearch();
         //get default categories for empty query
-        presenter.searchForCategories(null,mediaTitleList);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (presenter != null && isVisible && (categories == null || categories.isEmpty())) {
+            presenter.searchForCategories(null);
+        }
     }
 
     private void addTextChangeListenerToEtSearch() {
@@ -95,7 +104,7 @@ private void addTextChangeListenerToEtSearch() {
     }
 
     private void searchForCategory(String query) {
-        presenter.searchForCategories(query, mediaTitleList);
+        presenter.searchForCategories(query);
     }
 
     private void initRecyclerView() {
@@ -130,8 +139,8 @@ public void showError(int stringResourceId) {
     @Override
     public void setCategories(List<CategoryItem> categories) {
         adapter.clear();
-        if (categories == null) {
-        } else {
+        if (categories != null) {
+            this.categories = categories;
             adapter.addAll(categories);
             adapter.notifyDataSetChanged();
         }
@@ -178,4 +187,14 @@ public void onPreviousButtonClicked() {
     public void categoryClicked(CategoryItem item) {
         presenter.onCategoryItemClicked(item);
     }
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        isVisible = isVisibleToUser;
+
+        if (presenter != null && isResumed() && (categories == null || categories.isEmpty())) {
+            presenter.searchForCategories(null);
+        }
+    }
 }

app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java

@@ -1,9 +1,13 @@
 package fr.free.nrw.commons.upload.mediaDetails;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.DisplayMetrics;
+import android.util.Log;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
@@ -159,6 +163,33 @@ private void init() {
         }
 
         attachImageViewScaleChangeListener();
+
+        addEtTitleTouchListener();
+    }
+
+    /**
+     * Handles the drawable click listener for Edit Text
+     */
+    private void addEtTitleTouchListener() {
+        etTitle.setOnTouchListener((v, event) -> {
+            //2 is for drawable right
+            float twelveDpInPixels = convertDpToPixel(12, getContext());
+            if (event.getAction() == MotionEvent.ACTION_UP && etTitle.getCompoundDrawables()[2].getBounds().contains((int)(etTitle.getWidth()-(event.getX()+twelveDpInPixels)),(int)(event.getY()-twelveDpInPixels))){
+                showInfoAlert(R.string.media_detail_title,R.string.title_info);
+                return true;
+            }
+            return false;
+        });
+    }
+
+    /**
+     * converts dp to pixel
+     * @param dp
+     * @param context
+     * @return
+     */
+    private float convertDpToPixel(float dp, Context context) {
+        return dp * ((float) context.getResources().getDisplayMetrics().densityDpi / DisplayMetrics.DENSITY_DEFAULT);
     }
 
     /**