Skip to content

Commit 5865d59

Browse files
ashishkumar468maskaravivek
ashishkumar468
authored and
maskaravivek
committed
Revert "Merge branch 'backend-overhaul' into master" (commons-app#3125)
* Revert "Merge branch 'backend-overhaul' into master" This reverts commit 0090f24, reversing changes made to 9bccbfe. * fixed test handleSubmitTest
1 parent cbdfb05 commit 5865d59

File tree

77 files changed

+3472
-1817
lines changed

Some content is hidden

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

77 files changed

+3472
-1817
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id 'com.github.triplet.play' version '2.2.1' apply false
33
}
4+
45
apply from: '../gitutils.gradle'
56
apply plugin: 'com.android.application'
67
apply plugin: 'kotlin-android'
@@ -30,8 +31,8 @@ dependencies {
3031
implementation 'com.jakewharton.rxbinding2:rxbinding-design:2.1.1'
3132
implementation 'com.facebook.fresco:fresco:1.13.0'
3233
implementation 'com.drewnoakes:metadata-extractor:2.11.0'
34+
implementation 'com.dmitrybrant:wikimedia-android-data-client:0.0.18'
3335
implementation 'org.apache.commons:commons-lang3:3.8.1'
34-
implementation 'com.dmitrybrant:wikimedia-android-data-client:0.0.25'
3536

3637
// UI
3738
implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'
@@ -191,7 +192,6 @@ android {
191192
buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.wikimedia.org/wikipedia/commons\""
192193
buildConfigField "String", "HOME_URL", "\"https://commons.wikimedia.org/wiki/\""
193194
buildConfigField "String", "COMMONS_URL", "\"https://commons.wikimedia.org\""
194-
buildConfigField "String", "WIKIDATA_URL", "\"https://wikidata.org\""
195195
buildConfigField "String", "MOBILE_HOME_URL", "\"https://commons.m.wikimedia.org/wiki/\""
196196
buildConfigField "String", "SIGNUP_LANDING_URL", "\"https://commons.m.wikimedia.org/w/index.php?title=Special:CreateAccount&returnto=Main+Page&returntoquery=welcome%3Dyes\""
197197
buildConfigField "String", "SIGNUP_SUCCESS_REDIRECTION_URL", "\"https://commons.m.wikimedia.org/w/index.php?title=Main_Page&welcome=yes\""
@@ -223,7 +223,6 @@ android {
223223
buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.beta.wmflabs.org/wikipedia/commons\""
224224
buildConfigField "String", "HOME_URL", "\"https://commons.wikimedia.beta.wmflabs.org/wiki/\""
225225
buildConfigField "String", "COMMONS_URL", "\"https://commons.wikimedia.beta.wmflabs.org\""
226-
buildConfigField "String", "WIKIDATA_URL", "\"https://wikidata.org\""
227226
buildConfigField "String", "MOBILE_HOME_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/wiki/\""
228227
buildConfigField "String", "SIGNUP_LANDING_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/w/index.php?title=Special:CreateAccount&returnto=Main+Page&returntoquery=welcome%3Dyes\""
229228
buildConfigField "String", "SIGNUP_SUCCESS_REDIRECTION_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/w/index.php?title=Main_Page&welcome=yes\""

‎app/src/main/AndroidManifest.xml‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,7 @@
152152
</service>
153153
<service
154154
android:name=".contributions.ContributionsSyncService"
155-
android:exported="true"
156-
android:process=":sync">
155+
android:exported="true">
157156
<intent-filter>
158157
<action android:name="android.content.SyncAdapter" />
159158
</intent-filter>
@@ -162,6 +161,17 @@
162161
android:name="android.content.SyncAdapter"
163162
android:resource="@xml/contributions_sync_adapter" />
164163
</service>
164+
<service
165+
android:name=".modifications.ModificationsSyncService"
166+
android:exported="true">
167+
<intent-filter>
168+
<action android:name="android.content.SyncAdapter" />
169+
</intent-filter>
170+
171+
<meta-data
172+
android:name="android.content.SyncAdapter"
173+
android:resource="@xml/modifications_sync_adapter" />
174+
</service>
165175

166176
<service
167177
android:name="org.acra.sender.SenderService"
@@ -183,7 +193,12 @@
183193
android:exported="false"
184194
android:label="@string/provider_contributions"
185195
android:syncable="true" />
186-
196+
<provider
197+
android:name=".modifications.ModificationsContentProvider"
198+
android:authorities="${applicationId}.modifications.contentprovider"
199+
android:exported="false"
200+
android:label="@string/provider_modifications"
201+
android:syncable="true" />
187202
<provider
188203
android:name=".category.CategoryContentProvider"
189204
android:authorities="${applicationId}.categories.contentprovider"

‎app/src/main/java/fr/free/nrw/commons/CommonsAppAdapter.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,15 @@ public String getPassword() {
6161

6262
@Override
6363
public void updateAccount(@NonNull LoginResult result) {
64-
sessionManager.updateAccount(result);
64+
// TODO: sessionManager.updateAccount(result);
6565
}
6666

6767
@Override
6868
public SharedPreferenceCookieManager getCookies() {
6969
if (!preferences.contains(COOKIE_STORE_NAME)) {
7070
return null;
7171
}
72-
return GsonUnmarshaller.unmarshal(SharedPreferenceCookieManager.class,
73-
preferences.getString(COOKIE_STORE_NAME, null));
72+
return GsonUnmarshaller.unmarshal(SharedPreferenceCookieManager.class, preferences.getString(COOKIE_STORE_NAME, null));
7473
}
7574

7675
@Override

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import android.os.Process;
1111
import android.util.Log;
1212

13-
import androidx.annotation.NonNull;
14-
1513
import com.facebook.drawee.backends.pipeline.Fresco;
1614
import com.facebook.imagepipeline.core.ImagePipelineConfig;
1715
import com.squareup.leakcanary.LeakCanary;
@@ -30,6 +28,7 @@
3028
import javax.inject.Inject;
3129
import javax.inject.Named;
3230

31+
import androidx.annotation.NonNull;
3332
import fr.free.nrw.commons.auth.SessionManager;
3433
import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao;
3534
import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao;
@@ -42,6 +41,7 @@
4241
import fr.free.nrw.commons.kvstore.JsonKvStore;
4342
import fr.free.nrw.commons.logging.FileLoggingTree;
4443
import fr.free.nrw.commons.logging.LogUtils;
44+
import fr.free.nrw.commons.modifications.ModifierSequenceDao;
4545
import fr.free.nrw.commons.upload.FileUtils;
4646
import fr.free.nrw.commons.utils.ConfigUtils;
4747
import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -265,6 +265,7 @@ private void updateAllDatabases() {
265265
dbOpenHelper.getReadableDatabase().close();
266266
SQLiteDatabase db = dbOpenHelper.getWritableDatabase();
267267

268+
ModifierSequenceDao.Table.onDelete(db);
268269
CategoryDao.Table.onDelete(db);
269270
ContributionDao.Table.onDelete(db);
270271
BookmarkPicturesDao.Table.onDelete(db);

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

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
import android.os.Parcel;
55
import android.os.Parcelable;
66

7-
import androidx.annotation.NonNull;
8-
import androidx.annotation.Nullable;
9-
107
import org.apache.commons.lang3.StringUtils;
118
import org.wikipedia.dataclient.mwapi.MwQueryPage;
129
import org.wikipedia.gallery.ExtMetadata;
@@ -23,13 +20,14 @@
2320
import java.util.Locale;
2421
import java.util.Map;
2522

23+
import androidx.annotation.NonNull;
24+
import androidx.annotation.Nullable;
2625
import fr.free.nrw.commons.location.LatLng;
2726
import fr.free.nrw.commons.utils.CommonsDateUtil;
2827
import fr.free.nrw.commons.utils.MediaDataExtractorUtil;
2928

3029
public class Media implements Parcelable {
3130

32-
public static final Media EMPTY = new Media("");
3331
public static Creator<Media> CREATOR = new Creator<Media>() {
3432
@Override
3533
public Media createFromParcel(Parcel parcel) {
@@ -158,9 +156,9 @@ public static Media from(MwQueryPage page) {
158156
page.title(),
159157
"",
160158
0,
161-
safeParseDate(metadata.dateTime()),
162-
safeParseDate(metadata.dateTime()),
163-
StringUtil.fromHtml(metadata.artist()).toString()
159+
safeParseDate(metadata.dateTimeOriginal().value()),
160+
safeParseDate(metadata.dateTime().value()),
161+
StringUtil.fromHtml(metadata.artist().value()).toString()
164162
);
165163

166164
if (!StringUtils.isBlank(imageInfo.getThumbUrl())) {
@@ -172,17 +170,17 @@ public static Media from(MwQueryPage page) {
172170
language = "default";
173171
}
174172

175-
media.setDescriptions(Collections.singletonMap(language, metadata.imageDescription()));
176-
media.setCategories(MediaDataExtractorUtil.extractCategoriesFromList(metadata.getCategories()));
177-
String latitude = metadata.getGpsLatitude();
178-
String longitude = metadata.getGpsLongitude();
173+
media.setDescriptions(Collections.singletonMap(language, metadata.imageDescription().value()));
174+
media.setCategories(MediaDataExtractorUtil.extractCategoriesFromList(metadata.categories().value()));
175+
String latitude = metadata.gpsLatitude().value();
176+
String longitude = metadata.gpsLongitude().value();
179177

180178
if (!StringUtils.isBlank(latitude) && !StringUtils.isBlank(longitude)) {
181179
LatLng latLng = new LatLng(Double.parseDouble(latitude), Double.parseDouble(longitude), 0);
182180
media.setCoordinates(latLng);
183181
}
184182

185-
media.setLicenseInformation(metadata.licenseShortName(), metadata.licenseUrl());
183+
media.setLicenseInformation(metadata.licenseShortName().value(), metadata.licenseUrl().value());
186184
return media;
187185
}
188186

‎app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java‎

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

3-
import androidx.core.text.HtmlCompat;
4-
53
import javax.inject.Inject;
64
import javax.inject.Singleton;
75

8-
import fr.free.nrw.commons.media.MediaClient;
6+
import androidx.core.text.HtmlCompat;
97
import fr.free.nrw.commons.mwapi.MediaWikiApi;
108
import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
119
import io.reactivex.Single;
@@ -21,15 +19,12 @@
2119
public class MediaDataExtractor {
2220
private final MediaWikiApi mediaWikiApi;
2321
private final OkHttpJsonApiClient okHttpJsonApiClient;
24-
private final MediaClient mediaClient;
2522

2623
@Inject
2724
public MediaDataExtractor(MediaWikiApi mwApi,
28-
OkHttpJsonApiClient okHttpJsonApiClient,
29-
MediaClient mediaClient) {
25+
OkHttpJsonApiClient okHttpJsonApiClient) {
3026
this.okHttpJsonApiClient = okHttpJsonApiClient;
3127
this.mediaWikiApi = mwApi;
32-
this.mediaClient = mediaClient;
3328
}
3429

3530
/**
@@ -40,7 +35,7 @@ public MediaDataExtractor(MediaWikiApi mwApi,
4035
*/
4136
public Single<Media> fetchMediaDetails(String filename) {
4237
Single<Media> mediaSingle = getMediaFromFileName(filename);
43-
Single<Boolean> pageExistsSingle = mediaClient.checkPageExistsUsingTitle("Commons:Deletion_requests/" + filename);
38+
Single<Boolean> pageExistsSingle = mediaWikiApi.pageExists("Commons:Deletion_requests/" + filename);
4439
Single<String> discussionSingle = getDiscussion(filename);
4540
return Single.zip(mediaSingle, pageExistsSingle, discussionSingle, (media, deletionStatus, discussion) -> {
4641
media.setDiscussion(discussion);
@@ -57,7 +52,7 @@ public Single<Media> fetchMediaDetails(String filename) {
5752
* @return return data rich Media object
5853
*/
5954
public Single<Media> getMediaFromFileName(String filename) {
60-
return mediaClient.getMedia(filename);
55+
return okHttpJsonApiClient.getMedia(filename, false);
6156
}
6257

6358
/**

‎app/src/main/java/fr/free/nrw/commons/actions/PageEditClient.java‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

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

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎app/src/main/java/fr/free/nrw/commons/actions/ThanksClient.java‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)