Skip to content

Commit 0c30852

Browse files
authored
Data client simplification / removal (commons-app#5507)
* Removed unused code from the data client module * Move remaining code out of the data-client and remove it
1 parent 72a6fd2 commit 0c30852

File tree

337 files changed

+964
-31321
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

337 files changed

+964
-31321
lines changed

app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ if (isRunningOnTravisAndIsNotPRBuild) {
1616

1717
dependencies {
1818

19-
implementation project(':wikimedia-data-client')
2019
// Utils
2120
implementation 'in.yuvi:http.fluent:1.3'
2221
implementation 'com.google.code.gson:gson:2.8.5'

app/src/main/java/fr/free/nrw/commons/CommonsApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
import org.acra.annotation.AcraDialog;
6060
import org.acra.annotation.AcraMailSender;
6161
import org.acra.data.StringFormat;
62-
import org.wikipedia.language.AppLanguageLookUpTable;
62+
import fr.free.nrw.commons.language.AppLanguageLookUpTable;
6363
import timber.log.Timber;
6464

6565
@AcraCore(

app/src/main/java/fr/free/nrw/commons/Media.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ package fr.free.nrw.commons
33
import android.os.Parcelable
44
import fr.free.nrw.commons.location.LatLng
55
import kotlinx.android.parcel.Parcelize
6-
import org.wikipedia.dataclient.mwapi.MwQueryPage
7-
import org.wikipedia.page.PageTitle
6+
import fr.free.nrw.commons.wikidata.model.page.PageTitle
87
import java.util.*
98

109
@Parcelize

app/src/main/java/fr/free/nrw/commons/OkHttpConnectionFactory.java

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import okhttp3.ResponseBody;
1616
import okhttp3.logging.HttpLoggingInterceptor;
1717
import okhttp3.logging.HttpLoggingInterceptor.Level;
18-
import org.wikipedia.dataclient.okhttp.HttpStatusException;
1918
import timber.log.Timber;
2019

2120
public final class OkHttpConnectionFactory {
@@ -110,4 +109,30 @@ private boolean isExcludedUrl(final Request request) {
110109

111110
private OkHttpConnectionFactory() {
112111
}
112+
113+
public static class HttpStatusException extends IOException {
114+
private final int code;
115+
private final String url;
116+
public HttpStatusException(@NonNull Response rsp) {
117+
this.code = rsp.code();
118+
this.url = rsp.request().url().uri().toString();
119+
try {
120+
if (rsp.body() != null && rsp.body().contentType() != null
121+
&& rsp.body().contentType().toString().contains("json")) {
122+
}
123+
} catch (Exception e) {
124+
// Log?
125+
}
126+
}
127+
128+
public int code() {
129+
return code;
130+
}
131+
132+
@Override
133+
public String getMessage() {
134+
String str = "Code: " + code + ", URL: " + url;
135+
return str;
136+
}
137+
}
113138
}

app/src/main/java/fr/free/nrw/commons/Utils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import fr.free.nrw.commons.kvstore.JsonKvStore;
2121
import java.util.Calendar;
2222
import java.util.Date;
23-
import org.wikipedia.dataclient.WikiSite;
24-
import org.wikipedia.page.PageTitle;
23+
import fr.free.nrw.commons.wikidata.model.WikiSite;
24+
import fr.free.nrw.commons.wikidata.model.page.PageTitle;
2525

2626
import java.util.Locale;
2727
import java.util.regex.Pattern;

app/src/main/java/fr/free/nrw/commons/actions/MwThankPostResponse.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package fr.free.nrw.commons.actions
22

3-
import org.wikipedia.dataclient.mwapi.MwResponse
3+
import fr.free.nrw.commons.wikidata.mwapi.MwResponse
44

55
/**
66
* Response of the Thanks API.

app/src/main/java/fr/free/nrw/commons/actions/PageEditInterface.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package fr.free.nrw.commons.actions
22

33
import fr.free.nrw.commons.wikidata.WikidataConstants.MW_API_PREFIX
4+
import fr.free.nrw.commons.wikidata.model.Entities
5+
import fr.free.nrw.commons.wikidata.model.edit.Edit
46
import io.reactivex.Observable
57
import io.reactivex.Single
6-
import org.wikipedia.dataclient.mwapi.MwQueryResponse
7-
import org.wikipedia.edit.Edit
8-
import org.wikipedia.wikidata.Entities
8+
import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
99
import retrofit2.http.*
1010

1111
/**

app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import fr.free.nrw.commons.databinding.ActivityLoginBinding;
3131
import fr.free.nrw.commons.utils.ActivityUtils;
3232
import java.util.Locale;
33-
import org.wikipedia.dataclient.mwapi.MwQueryResponse;
33+
import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse;
3434
import fr.free.nrw.commons.auth.login.LoginCallback;
3535

3636
import javax.inject.Inject;

app/src/main/java/fr/free/nrw/commons/auth/csrf/CsrfTokenClient.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package fr.free.nrw.commons.auth.csrf
22

33
import androidx.annotation.VisibleForTesting
44
import fr.free.nrw.commons.auth.SessionManager
5-
import org.wikipedia.dataclient.mwapi.MwQueryResponse
5+
import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
66
import fr.free.nrw.commons.auth.login.LoginClient
77
import fr.free.nrw.commons.auth.login.LoginCallback
88
import fr.free.nrw.commons.auth.login.LoginFailedException

app/src/main/java/fr/free/nrw/commons/auth/csrf/CsrfTokenInterface.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package fr.free.nrw.commons.auth.csrf
22

33
import fr.free.nrw.commons.wikidata.WikidataConstants.MW_API_PREFIX
4-
import org.wikipedia.dataclient.mwapi.MwQueryResponse
4+
import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
55
import retrofit2.Call
66
import retrofit2.http.GET
77
import retrofit2.http.Headers

0 commit comments

Comments
 (0)