From db3f0f2505a7505b77c027f0743277ff0303a8c1 Mon Sep 17 00:00:00 2001
From: Rohit Verma <rv17837@outlook.com>
Date: Wed, 28 Aug 2024 09:54:24 +0530
Subject: [PATCH] refactor: update SettingsActivity to not use custom
 appCompatDeletegate

It is required because that delegate is automatically handled in new libraries.
---
 .../fr/free/nrw/commons/settings/SettingsActivity.java | 10 +++++-----
 .../nrw/commons/wikidata/WikidataEditServiceTest.kt    |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java b/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java
index fd231597b..ff5024b32 100644
--- a/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java
@@ -15,7 +15,7 @@ import fr.free.nrw.commons.theme.BaseActivity;
 public class SettingsActivity extends BaseActivity {
 
     private ActivitySettingsBinding binding;
-    private AppCompatDelegate settingsDelegate;
+//    private AppCompatDelegate settingsDelegate;
     /**
      * to be called when the activity starts
      * @param savedInstanceState the previously saved state
@@ -39,10 +39,10 @@ public class SettingsActivity extends BaseActivity {
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
-        if (settingsDelegate == null) {
-            settingsDelegate = AppCompatDelegate.create(this, null);
-        }
-        settingsDelegate.onPostCreate(savedInstanceState);
+//        if (settingsDelegate == null) {
+//            settingsDelegate = AppCompatDelegate.create(this, null);
+//        }
+//        settingsDelegate.onPostCreate(savedInstanceState);
     }
 
     @Override
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataEditServiceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataEditServiceTest.kt
index 9232395ba..353057435 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataEditServiceTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataEditServiceTest.kt
@@ -8,6 +8,7 @@ import com.nhaarman.mockitokotlin2.whenever
 import fr.free.nrw.commons.kvstore.JsonKvStore
 import fr.free.nrw.commons.upload.UploadResult
 import fr.free.nrw.commons.upload.WikidataPlace
+import fr.free.nrw.commons.wikidata.model.RemoveClaim
 import io.reactivex.Observable
 import org.junit.Before
 import org.junit.Test
@@ -18,8 +19,6 @@ import org.mockito.Mock
 import org.mockito.Mockito
 import org.mockito.Mockito.verifyNoInteractions
 import org.mockito.MockitoAnnotations
-import fr.free.nrw.commons.wikidata.model.EditClaim
-import fr.free.nrw.commons.wikidata.model.RemoveClaim
 
 class WikidataEditServiceTest {
     @Mock
@@ -56,7 +55,8 @@ class WikidataEditServiceTest {
     fun testUpdateDepictsProperty() {
         val fileEntityId = "12345"
 
-        whenever(wikibaseClient.getClaimIdsByProperty("M" + fileEntityId, "P180"))
+        whenever(wikibaseClient.getClaimIdsByProperty("M" + fileEntityId,
+            WikidataProperties.DEPICTS.propertyName))
             .thenReturn(Observable.just(emptyList()))
         whenever(wikibaseClient.postDeleteClaims("M" + fileEntityId,
             gson.toJson(Mockito.mock(RemoveClaim::class.java)))