mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-31 23:03:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: update SettingsActivity to not use custom appCompatDeletegate

Browse source 
It is required because that delegate is automatically handled in new libraries.
This commit is contained in:
Rohit Verma 2024-08-28 09:54:24 +05:30
parent e21796938e
commit db3f0f2505
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java
View file

@ -15,7 +15,7 @@ import fr.free.nrw.commons.theme.BaseActivity;
public class SettingsActivity extends BaseActivity { public class SettingsActivity extends BaseActivity {
private ActivitySettingsBinding binding; private ActivitySettingsBinding binding;
private AppCompatDelegate settingsDelegate; // private AppCompatDelegate settingsDelegate;
/** /**
* to be called when the activity starts * to be called when the activity starts
* @param savedInstanceState the previously saved state * @param savedInstanceState the previously saved state
@ -39,10 +39,10 @@ public class SettingsActivity extends BaseActivity {
@Override @Override
protected void onPostCreate(Bundle savedInstanceState) { protected void onPostCreate(Bundle savedInstanceState) {
super.onPostCreate(savedInstanceState); super.onPostCreate(savedInstanceState);
if (settingsDelegate == null) { // if (settingsDelegate == null) {
settingsDelegate = AppCompatDelegate.create(this, null); // settingsDelegate = AppCompatDelegate.create(this, null);
} // }
settingsDelegate.onPostCreate(savedInstanceState); // settingsDelegate.onPostCreate(savedInstanceState);
} }
@Override @Override

6
app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataEditServiceTest.kt
View file

@ -8,6 +8,7 @@ import com.nhaarman.mockitokotlin2.whenever
import fr.free.nrw.commons.kvstore.JsonKvStore import fr.free.nrw.commons.kvstore.JsonKvStore
import fr.free.nrw.commons.upload.UploadResult import fr.free.nrw.commons.upload.UploadResult
import fr.free.nrw.commons.upload.WikidataPlace import fr.free.nrw.commons.upload.WikidataPlace
import fr.free.nrw.commons.wikidata.model.RemoveClaim
import io.reactivex.Observable import io.reactivex.Observable
import org.junit.Before import org.junit.Before
import org.junit.Test import org.junit.Test
@ -18,8 +19,6 @@ import org.mockito.Mock
import org.mockito.Mockito import org.mockito.Mockito
import org.mockito.Mockito.verifyNoInteractions import org.mockito.Mockito.verifyNoInteractions
import org.mockito.MockitoAnnotations import org.mockito.MockitoAnnotations
import fr.free.nrw.commons.wikidata.model.EditClaim
import fr.free.nrw.commons.wikidata.model.RemoveClaim
class WikidataEditServiceTest { class WikidataEditServiceTest {
@Mock @Mock
@ -56,7 +55,8 @@ class WikidataEditServiceTest {
fun testUpdateDepictsProperty() { fun testUpdateDepictsProperty() {
val fileEntityId = "12345" val fileEntityId = "12345"
whenever(wikibaseClient.getClaimIdsByProperty("M" + fileEntityId, "P180")) whenever(wikibaseClient.getClaimIdsByProperty("M" + fileEntityId,
WikidataProperties.DEPICTS.propertyName))
.thenReturn(Observable.just(emptyList())) .thenReturn(Observable.just(emptyList()))
whenever(wikibaseClient.postDeleteClaims("M" + fileEntityId, whenever(wikibaseClient.postDeleteClaims("M" + fileEntityId,
gson.toJson(Mockito.mock(RemoveClaim::class.java))) gson.toJson(Mockito.mock(RemoveClaim::class.java)))