Merge pull request #1 from madhurgupta10/main-resolved

Rebase Branch to Main
madhurgupta10 · Feb 3, 2024 · 674ce70 · 674ce70
2 parents bfc5848 + f045f30
commit 674ce70
Show file tree

Hide file tree

Showing 342 changed files with 1,019 additions and 31,329 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,7 +16,6 @@ if (isRunningOnTravisAndIsNotPRBuild) {
 
 dependencies {
 
-    implementation project(':wikimedia-data-client')
     implementation project(':profile')
 
     // Utils

diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
@@ -59,7 +59,7 @@
 import org.acra.annotation.AcraDialog;
 import org.acra.annotation.AcraMailSender;
 import org.acra.data.StringFormat;
-import org.wikipedia.language.AppLanguageLookUpTable;
+import fr.free.nrw.commons.language.AppLanguageLookUpTable;
 import timber.log.Timber;
 
 @AcraCore(

diff --git a/app/src/main/java/fr/free/nrw/commons/Media.kt b/app/src/main/java/fr/free/nrw/commons/Media.kt
@@ -3,8 +3,7 @@ package fr.free.nrw.commons
 import android.os.Parcelable
 import fr.free.nrw.commons.location.LatLng
 import kotlinx.android.parcel.Parcelize
-import org.wikipedia.dataclient.mwapi.MwQueryPage
-import org.wikipedia.page.PageTitle
+import fr.free.nrw.commons.wikidata.model.page.PageTitle
 import java.util.*
 
 @Parcelize

diff --git a/app/src/main/java/fr/free/nrw/commons/OkHttpConnectionFactory.java b/app/src/main/java/fr/free/nrw/commons/OkHttpConnectionFactory.java
@@ -15,7 +15,6 @@
 import okhttp3.ResponseBody;
 import okhttp3.logging.HttpLoggingInterceptor;
 import okhttp3.logging.HttpLoggingInterceptor.Level;
-import org.wikipedia.dataclient.okhttp.HttpStatusException;
 import timber.log.Timber;
 
 public final class OkHttpConnectionFactory {
@@ -110,4 +109,30 @@ private boolean isExcludedUrl(final Request request) {
 
     private OkHttpConnectionFactory() {
     }
+
+    public static class HttpStatusException extends IOException {
+        private final int code;
+        private final String url;
+        public HttpStatusException(@NonNull Response rsp) {
+            this.code = rsp.code();
+            this.url = rsp.request().url().uri().toString();
+            try {
+                if (rsp.body() != null && rsp.body().contentType() != null
+                        && rsp.body().contentType().toString().contains("json")) {
+                }
+            } catch (Exception e) {
+                // Log?
+            }
+        }
+
+        public int code() {
+            return code;
+        }
+
+        @Override
+        public String getMessage() {
+            String str = "Code: " + code + ", URL: " + url;
+            return str;
+        }
+    }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/Utils.java b/app/src/main/java/fr/free/nrw/commons/Utils.java
@@ -20,8 +20,8 @@
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import java.util.Calendar;
 import java.util.Date;
-import org.wikipedia.dataclient.WikiSite;
-import org.wikipedia.page.PageTitle;
+import fr.free.nrw.commons.wikidata.model.WikiSite;
+import fr.free.nrw.commons.wikidata.model.page.PageTitle;
 
 import java.util.Locale;
 import java.util.regex.Pattern;

diff --git a/app/src/main/java/fr/free/nrw/commons/actions/MwThankPostResponse.kt b/app/src/main/java/fr/free/nrw/commons/actions/MwThankPostResponse.kt
@@ -1,6 +1,6 @@
 package fr.free.nrw.commons.actions
 
-import org.wikipedia.dataclient.mwapi.MwResponse
+import fr.free.nrw.commons.wikidata.mwapi.MwResponse
 
 /**
  * Response of the Thanks API.

diff --git a/app/src/main/java/fr/free/nrw/commons/actions/PageEditInterface.kt b/app/src/main/java/fr/free/nrw/commons/actions/PageEditInterface.kt
@@ -1,11 +1,11 @@
 package fr.free.nrw.commons.actions
 
 import fr.free.nrw.commons.wikidata.WikidataConstants.MW_API_PREFIX
+import fr.free.nrw.commons.wikidata.model.Entities
+import fr.free.nrw.commons.wikidata.model.edit.Edit
 import io.reactivex.Observable
 import io.reactivex.Single
-import org.wikipedia.dataclient.mwapi.MwQueryResponse
-import org.wikipedia.edit.Edit
-import org.wikipedia.wikidata.Entities
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
 import retrofit2.http.*
 
 /**

diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
@@ -30,7 +30,7 @@
 import fr.free.nrw.commons.databinding.ActivityLoginBinding;
 import fr.free.nrw.commons.utils.ActivityUtils;
 import java.util.Locale;
-import org.wikipedia.dataclient.mwapi.MwQueryResponse;
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse;
 import fr.free.nrw.commons.auth.login.LoginCallback;
 
 import javax.inject.Inject;

diff --git a/app/src/main/java/fr/free/nrw/commons/auth/csrf/CsrfTokenClient.kt b/app/src/main/java/fr/free/nrw/commons/auth/csrf/CsrfTokenClient.kt
@@ -2,7 +2,7 @@ package fr.free.nrw.commons.auth.csrf
 
 import androidx.annotation.VisibleForTesting
 import fr.free.nrw.commons.auth.SessionManager
-import org.wikipedia.dataclient.mwapi.MwQueryResponse
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
 import fr.free.nrw.commons.auth.login.LoginClient
 import fr.free.nrw.commons.auth.login.LoginCallback
 import fr.free.nrw.commons.auth.login.LoginFailedException

diff --git a/app/src/main/java/fr/free/nrw/commons/auth/csrf/CsrfTokenInterface.kt b/app/src/main/java/fr/free/nrw/commons/auth/csrf/CsrfTokenInterface.kt
@@ -1,7 +1,7 @@
 package fr.free.nrw.commons.auth.csrf
 
 import fr.free.nrw.commons.wikidata.WikidataConstants.MW_API_PREFIX
-import org.wikipedia.dataclient.mwapi.MwQueryResponse
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Headers

diff --git a/app/src/main/java/fr/free/nrw/commons/auth/login/LoginClient.kt b/app/src/main/java/fr/free/nrw/commons/auth/login/LoginClient.kt
@@ -6,7 +6,7 @@ import fr.free.nrw.commons.auth.login.LoginResult.ResetPasswordResult
 import fr.free.nrw.commons.wikidata.WikidataConstants.WIKIPEDIA_URL
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import org.wikipedia.dataclient.mwapi.MwQueryResponse
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response

diff --git a/app/src/main/java/fr/free/nrw/commons/auth/login/LoginInterface.kt b/app/src/main/java/fr/free/nrw/commons/auth/login/LoginInterface.kt
@@ -2,7 +2,7 @@ package fr.free.nrw.commons.auth.login
 
 import fr.free.nrw.commons.wikidata.WikidataConstants.MW_API_PREFIX
 import io.reactivex.Observable
-import org.wikipedia.dataclient.mwapi.MwQueryResponse
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
 import retrofit2.Call
 import retrofit2.http.Field
 import retrofit2.http.FormUrlEncoded

diff --git a/app/src/main/java/fr/free/nrw/commons/auth/login/LoginResponse.kt b/app/src/main/java/fr/free/nrw/commons/auth/login/LoginResponse.kt
@@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName
 import fr.free.nrw.commons.auth.login.LoginResult.OAuthResult
 import fr.free.nrw.commons.auth.login.LoginResult.ResetPasswordResult
 import fr.free.nrw.commons.auth.login.LoginResult.Result
-import org.wikipedia.dataclient.mwapi.MwServiceError
+import fr.free.nrw.commons.wikidata.mwapi.MwServiceError
 
 class LoginResponse {
     @SerializedName("error")

diff --git a/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignView.java b/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignView.java
@@ -12,7 +12,7 @@
 
 import fr.free.nrw.commons.campaigns.models.Campaign;
 import fr.free.nrw.commons.theme.BaseActivity;
-import org.wikipedia.util.DateUtil;
+import fr.free.nrw.commons.utils.DateUtil;
 
 import java.text.ParseException;
 import java.util.Date;

diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt b/app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt
@@ -1,7 +1,7 @@
 package fr.free.nrw.commons.category
 
 import io.reactivex.Single
-import org.wikipedia.dataclient.mwapi.MwQueryResponse
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
 import javax.inject.Inject
 import javax.inject.Singleton
 

diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.java b/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.java
@@ -29,7 +29,7 @@
 import fr.free.nrw.commons.theme.BaseActivity;
 import java.util.ArrayList;
 import java.util.List;
-import org.wikipedia.page.PageTitle;
+import fr.free.nrw.commons.wikidata.model.page.PageTitle;
 
 /**
  * This activity displays details of a particular category

diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryInterface.java b/app/src/main/java/fr/free/nrw/commons/category/CategoryInterface.java
@@ -2,7 +2,7 @@
 
 import io.reactivex.Single;
 import java.util.Map;
-import org.wikipedia.dataclient.mwapi.MwQueryResponse;
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse;
 import retrofit2.http.GET;
 import retrofit2.http.Query;
 import retrofit2.http.QueryMap;

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
@@ -538,11 +538,23 @@ private void updateClosestNearbyCardViewInfo() {
 
     private void updateNearbyNotification(@Nullable NearbyController.NearbyPlacesInfo nearbyPlacesInfo) {
         if (nearbyPlacesInfo != null && nearbyPlacesInfo.placeList != null && nearbyPlacesInfo.placeList.size() > 0) {
-            Place closestNearbyPlace = nearbyPlacesInfo.placeList.get(0);
-            String distance = formatDistanceBetween(curLatLng, closestNearbyPlace.location);
-            closestNearbyPlace.setDistance(distance);
-            direction = (float) computeBearing(curLatLng, closestNearbyPlace.location);
-            nearbyNotificationCardView.updateContent(closestNearbyPlace);
+            Place closestNearbyPlace = null;
+            // Find the first nearby place that has no image and exists
+            for (Place place : nearbyPlacesInfo.placeList) {
+                if (place.pic.equals("") && place.exists) {
+                    closestNearbyPlace = place;
+                    break;
+                }
+            }
+
+            if(closestNearbyPlace == null) {
+                nearbyNotificationCardView.setVisibility(View.GONE);
+            }else{
+                String distance = formatDistanceBetween(curLatLng, closestNearbyPlace.location);
+                closestNearbyPlace.setDistance(distance);
+                direction = (float) computeBearing(curLatLng, closestNearbyPlace.location);
+                nearbyNotificationCardView.updateContent(closestNearbyPlace);
+            }
         } else {
             // Means that no close nearby place is found
             nearbyNotificationCardView.setVisibility(View.GONE);

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
@@ -52,7 +52,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.apache.commons.lang3.StringUtils;
-import org.wikipedia.dataclient.WikiSite;
+import fr.free.nrw.commons.wikidata.model.WikiSite;
 
 
 /**

diff --git a/app/src/main/java/fr/free/nrw/commons/delete/ReasonBuilder.java b/app/src/main/java/fr/free/nrw/commons/delete/ReasonBuilder.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 
-import org.wikipedia.util.DateUtil;
+import fr.free.nrw.commons.utils.DateUtil;
 
 import java.util.Date;
 import java.util.Locale;

diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java
@@ -41,7 +41,6 @@
 import java.util.Objects;
 import javax.inject.Named;
 import javax.inject.Singleton;
-import org.wikipedia.AppAdapter;
 
 /**
  * The Dependency Provider class for Commons Android.

diff --git a/app/src/main/java/fr/free/nrw/commons/di/NetworkingModule.java b/app/src/main/java/fr/free/nrw/commons/di/NetworkingModule.java
@@ -45,8 +45,8 @@
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
 import okhttp3.logging.HttpLoggingInterceptor.Level;
-import org.wikipedia.dataclient.WikiSite;
-import org.wikipedia.json.GsonUtil;
+import fr.free.nrw.commons.wikidata.model.WikiSite;
+import fr.free.nrw.commons.wikidata.GsonUtil;
 import timber.log.Timber;
 
 @Module

diff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictsClient.kt b/app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictsClient.kt
@@ -7,11 +7,11 @@ import fr.free.nrw.commons.upload.depicts.DepictsInterface
 import fr.free.nrw.commons.upload.structure.depictions.DepictedItem
 import fr.free.nrw.commons.upload.structure.depictions.get
 import fr.free.nrw.commons.wikidata.WikidataProperties
+import fr.free.nrw.commons.wikidata.model.DataValue
 import fr.free.nrw.commons.wikidata.model.DepictSearchItem
+import fr.free.nrw.commons.wikidata.model.Entities
+import fr.free.nrw.commons.wikidata.model.Statement_partial
 import io.reactivex.Single
-import org.wikipedia.wikidata.DataValue
-import org.wikipedia.wikidata.Entities
-import org.wikipedia.wikidata.Statement_partial
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton

diff --git a/app/src/main/java/fr/free/nrw/commons/explore/media/MediaConverter.kt b/app/src/main/java/fr/free/nrw/commons/explore/media/MediaConverter.kt
@@ -6,12 +6,12 @@ import fr.free.nrw.commons.upload.structure.depictions.get
 import fr.free.nrw.commons.utils.CommonsDateUtil
 import fr.free.nrw.commons.utils.MediaDataExtractorUtil
 import fr.free.nrw.commons.wikidata.WikidataProperties
+import fr.free.nrw.commons.wikidata.model.DataValue
+import fr.free.nrw.commons.wikidata.model.Entities
 import org.apache.commons.lang3.StringUtils
-import org.wikipedia.dataclient.mwapi.MwQueryPage
-import org.wikipedia.gallery.ExtMetadata
-import org.wikipedia.gallery.ImageInfo
-import org.wikipedia.wikidata.DataValue
-import org.wikipedia.wikidata.Entities
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage
+import fr.free.nrw.commons.wikidata.model.gallery.ExtMetadata
+import fr.free.nrw.commons.wikidata.model.gallery.ImageInfo
 import java.text.ParseException
 import java.util.*
 import javax.inject.Inject

diff --git a/...edia/language/AppLanguageLookUpTable.java → ...mons/language/AppLanguageLookUpTable.java b/...edia/language/AppLanguageLookUpTable.java → ...mons/language/AppLanguageLookUpTable.java
@@ -1,4 +1,4 @@
-package org.wikipedia.language;
+package fr.free.nrw.commons.language;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -8,8 +8,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.wikipedia.dataclient.R;
-
+import fr.free.nrw.commons.R;
 import java.lang.ref.SoftReference;
 import java.util.Arrays;
 import java.util.List;

diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaClient.kt b/app/src/main/java/fr/free/nrw/commons/media/MediaClient.kt
@@ -5,10 +5,10 @@ import fr.free.nrw.commons.Media
 import fr.free.nrw.commons.category.ContinuationClient
 import fr.free.nrw.commons.explore.media.MediaConverter
 import fr.free.nrw.commons.utils.CommonsDateUtil
+import fr.free.nrw.commons.wikidata.model.Entities
 import io.reactivex.Single
-import org.wikipedia.dataclient.mwapi.MwQueryPage
-import org.wikipedia.dataclient.mwapi.MwQueryResponse
-import org.wikipedia.wikidata.Entities
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton

diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
@@ -115,9 +115,9 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.apache.commons.lang3.StringUtils;
-import org.wikipedia.dataclient.mwapi.MwQueryPage;
-import org.wikipedia.language.AppLanguageLookUpTable;
-import org.wikipedia.util.DateUtil;
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage;
+import fr.free.nrw.commons.language.AppLanguageLookUpTable;
+import fr.free.nrw.commons.utils.DateUtil;
 import timber.log.Timber;
 
 public class MediaDetailFragment extends CommonsDaggerSupportFragment implements

diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailInterface.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailInterface.java
@@ -2,10 +2,10 @@
 
 import static fr.free.nrw.commons.wikidata.WikidataConstants.MW_API_PREFIX;
 
+import fr.free.nrw.commons.wikidata.model.Entities;
 import io.reactivex.Observable;
 import io.reactivex.Single;
-import org.wikipedia.dataclient.mwapi.MwQueryResponse;
-import org.wikipedia.wikidata.Entities;
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse;
 import retrofit2.http.GET;
 import retrofit2.http.Query;
 

diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaInterface.java b/app/src/main/java/fr/free/nrw/commons/media/MediaInterface.java
@@ -2,7 +2,7 @@
 
 import io.reactivex.Single;
 import java.util.Map;
-import org.wikipedia.dataclient.mwapi.MwQueryResponse;
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse;
 import retrofit2.http.GET;
 import retrofit2.http.Query;
 import retrofit2.http.QueryMap;

diff --git a/app/src/main/java/fr/free/nrw/commons/media/MwParseResponse.java b/app/src/main/java/fr/free/nrw/commons/media/MwParseResponse.java
@@ -3,7 +3,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
-import org.wikipedia.dataclient.mwapi.MwResponse;
+import fr.free.nrw.commons.wikidata.mwapi.MwResponse;
 
 public class MwParseResponse extends MwResponse {
     @Nullable

diff --git a/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaClient.kt b/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaClient.kt
@@ -4,10 +4,10 @@ import fr.free.nrw.commons.BetaConstants
 import fr.free.nrw.commons.Media
 import fr.free.nrw.commons.category.ContinuationClient
 import fr.free.nrw.commons.explore.media.MediaConverter
+import fr.free.nrw.commons.wikidata.model.Entities
 import io.reactivex.Single
-import org.wikipedia.dataclient.mwapi.MwQueryPage
-import org.wikipedia.dataclient.mwapi.MwQueryResponse
-import org.wikipedia.wikidata.Entities
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
 import javax.inject.Inject
 import javax.inject.Singleton
 

diff --git a/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaInterface.java b/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaInterface.java
@@ -3,7 +3,7 @@
 import static fr.free.nrw.commons.media.MediaInterface.MEDIA_PARAMS;
 
 import io.reactivex.Single;
-import org.wikipedia.dataclient.mwapi.MwQueryResponse;
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse;
 import retrofit2.http.GET;
 import retrofit2.http.Query;
 

diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/CategoryApi.java b/app/src/main/java/fr/free/nrw/commons/mwapi/CategoryApi.java
@@ -17,8 +17,8 @@
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
-import org.wikipedia.dataclient.mwapi.MwQueryPage;
-import org.wikipedia.dataclient.mwapi.MwQueryResponse;
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage;
+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse;
 import timber.log.Timber;
 
 /**