Skip to content

Commit ccd7b3d

Browse files
ilgazerashishkumar468
authored andcommitted
As per #3026, removed the obsolete classes in package mwapi (#3150)
1 parent 13d847e commit ccd7b3d

26 files changed

+40
-632
lines changed

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import javax.inject.Singleton;
77

88
import fr.free.nrw.commons.media.MediaClient;
9-
import fr.free.nrw.commons.mwapi.MediaWikiApi;
109
import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
1110
import io.reactivex.Single;
1211
import timber.log.Timber;
@@ -19,16 +18,13 @@
1918
*/
2019
@Singleton
2120
public class MediaDataExtractor {
22-
private final MediaWikiApi mediaWikiApi;
2321
private final OkHttpJsonApiClient okHttpJsonApiClient;
2422
private final MediaClient mediaClient;
2523

2624
@Inject
27-
public MediaDataExtractor(MediaWikiApi mwApi,
28-
OkHttpJsonApiClient okHttpJsonApiClient,
25+
public MediaDataExtractor(OkHttpJsonApiClient okHttpJsonApiClient,
2926
MediaClient mediaClient) {
3027
this.okHttpJsonApiClient = okHttpJsonApiClient;
31-
this.mediaWikiApi = mwApi;
3228
this.mediaClient = mediaClient;
3329
}
3430

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import fr.free.nrw.commons.di.ApplicationlessInjection;
4444
import fr.free.nrw.commons.explore.categories.ExploreActivity;
4545
import fr.free.nrw.commons.kvstore.JsonKvStore;
46-
import fr.free.nrw.commons.mwapi.MediaWikiApi;
4746
import fr.free.nrw.commons.theme.NavigationBaseActivity;
4847
import fr.free.nrw.commons.utils.ConfigUtils;
4948
import fr.free.nrw.commons.utils.ViewUtil;
@@ -64,9 +63,6 @@
6463

6564
public class LoginActivity extends AccountAuthenticatorActivity {
6665

67-
@Inject
68-
MediaWikiApi mwApi;
69-
7066
@Inject
7167
SessionManager sessionManager;
7268

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,23 @@
1717

1818
import fr.free.nrw.commons.BuildConfig;
1919
import fr.free.nrw.commons.kvstore.JsonKvStore;
20-
import fr.free.nrw.commons.mwapi.MediaWikiApi;
2120
import io.reactivex.Completable;
2221
import io.reactivex.Observable;
23-
import timber.log.Timber;
2422

2523
/**
2624
* Manage the current logged in user session.
2725
*/
2826
@Singleton
2927
public class SessionManager {
3028
private final Context context;
31-
private final MediaWikiApi mediaWikiApi;
3229
private Account currentAccount; // Unlike a savings account... ;-)
3330
private JsonKvStore defaultKvStore;
3431
private static final String KEY_RAWUSERNAME = "rawusername";
3532

3633
@Inject
3734
public SessionManager(Context context,
38-
MediaWikiApi mediaWikiApi,
3935
@Named("default_preferences") JsonKvStore defaultKvStore) {
4036
this.context = context;
41-
this.mediaWikiApi = mediaWikiApi;
4237
this.currentAccount = null;
4338
this.defaultKvStore = defaultKvStore;
4439
}
@@ -146,7 +141,6 @@ public Completable logout() {
146141
return Completable.fromObservable(Observable.fromArray(allAccounts)
147142
.map(a -> accountManager.removeAccount(a, null, null).getResult()))
148143
.doOnComplete(() -> {
149-
mediaWikiApi.logout();
150144
currentAccount = null;
151145
});
152146
}

app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.java

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

33
import android.text.TextUtils;
4-
import fr.free.nrw.commons.kvstore.JsonKvStore;
5-
import fr.free.nrw.commons.mwapi.MediaWikiApi;
6-
import fr.free.nrw.commons.upload.GpsCategoryModel;
7-
import fr.free.nrw.commons.utils.StringSortingUtils;
8-
import io.reactivex.Observable;
4+
95
import java.util.ArrayList;
106
import java.util.Calendar;
117
import java.util.Comparator;
128
import java.util.Date;
139
import java.util.HashMap;
1410
import java.util.List;
11+
1512
import javax.inject.Inject;
1613
import javax.inject.Named;
14+
15+
import fr.free.nrw.commons.kvstore.JsonKvStore;
16+
import fr.free.nrw.commons.upload.GpsCategoryModel;
17+
import fr.free.nrw.commons.utils.StringSortingUtils;
18+
import io.reactivex.Observable;
1719
import timber.log.Timber;
1820

1921
/**
@@ -22,7 +24,6 @@
2224
public class CategoriesModel{
2325
private static final int SEARCH_CATS_LIMIT = 25;
2426

25-
private final MediaWikiApi mwApi;
2627
private final CategoryClient categoryClient;
2728
private final CategoryDao categoryDao;
2829
private final JsonKvStore directKvStore;
@@ -32,11 +33,9 @@ public class CategoriesModel{
3233

3334
@Inject GpsCategoryModel gpsCategoryModel;
3435
@Inject
35-
public CategoriesModel(MediaWikiApi mwApi,
36-
CategoryClient categoryClient,
36+
public CategoriesModel(CategoryClient categoryClient,
3737
CategoryDao categoryDao,
3838
@Named("default_preferences") JsonKvStore directKvStore) {
39-
this.mwApi = mwApi;
4039
this.categoryClient = categoryClient;
4140
this.categoryDao = categoryDao;
4241
this.directKvStore = directKvStore;

app/src/main/java/fr/free/nrw/commons/category/SubCategoryListFragment.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44
import android.content.Intent;
55
import android.content.res.Configuration;
66
import android.os.Bundle;
7-
import androidx.recyclerview.widget.GridLayoutManager;
8-
import androidx.recyclerview.widget.LinearLayoutManager;
9-
import androidx.recyclerview.widget.RecyclerView;
107
import android.view.LayoutInflater;
118
import android.view.View;
129
import android.view.ViewGroup;
1310
import android.widget.ProgressBar;
1411
import android.widget.TextView;
1512

13+
import androidx.recyclerview.widget.GridLayoutManager;
14+
import androidx.recyclerview.widget.LinearLayoutManager;
15+
import androidx.recyclerview.widget.RecyclerView;
16+
1617
import com.pedrogomez.renderers.RVRendererAdapter;
1718

1819
import java.util.ArrayList;
@@ -26,10 +27,8 @@
2627
import fr.free.nrw.commons.R;
2728
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
2829
import fr.free.nrw.commons.explore.categories.SearchCategoriesAdapterFactory;
29-
import fr.free.nrw.commons.mwapi.MediaWikiApi;
3030
import fr.free.nrw.commons.utils.NetworkUtils;
3131
import fr.free.nrw.commons.utils.ViewUtil;
32-
import io.reactivex.Observable;
3332
import io.reactivex.android.schedulers.AndroidSchedulers;
3433
import io.reactivex.schedulers.Schedulers;
3534
import timber.log.Timber;

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java

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

3-
import static fr.free.nrw.commons.contributions.Contribution.STATE_FAILED;
4-
import static fr.free.nrw.commons.contributions.MainActivity.CONTRIBUTIONS_TAB_POSITION;
5-
import static fr.free.nrw.commons.utils.LengthUtils.formatDistanceBetween;
6-
73
import android.Manifest;
84
import android.content.ComponentName;
95
import android.content.Context;
@@ -17,12 +13,19 @@
1713
import android.view.ViewGroup;
1814
import android.widget.CheckBox;
1915
import android.widget.Toast;
16+
2017
import androidx.annotation.NonNull;
2118
import androidx.annotation.Nullable;
2219
import androidx.fragment.app.Fragment;
2320
import androidx.fragment.app.FragmentManager;
2421
import androidx.fragment.app.FragmentManager.OnBackStackChangedListener;
2522
import androidx.fragment.app.FragmentTransaction;
23+
24+
import java.util.ArrayList;
25+
26+
import javax.inject.Inject;
27+
import javax.inject.Named;
28+
2629
import butterknife.BindView;
2730
import butterknife.ButterKnife;
2831
import fr.free.nrw.commons.HandlerService;
@@ -41,7 +44,6 @@
4144
import fr.free.nrw.commons.location.LocationUpdateListener;
4245
import fr.free.nrw.commons.media.MediaDetailPagerFragment;
4346
import fr.free.nrw.commons.media.MediaDetailPagerFragment.MediaDetailProvider;
44-
import fr.free.nrw.commons.mwapi.MediaWikiApi;
4547
import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
4648
import fr.free.nrw.commons.nearby.NearbyController;
4749
import fr.free.nrw.commons.nearby.NearbyNotificationCardView;
@@ -57,11 +59,12 @@
5759
import io.reactivex.android.schedulers.AndroidSchedulers;
5860
import io.reactivex.disposables.CompositeDisposable;
5961
import io.reactivex.schedulers.Schedulers;
60-
import java.util.ArrayList;
61-
import javax.inject.Inject;
62-
import javax.inject.Named;
6362
import timber.log.Timber;
6463

64+
import static fr.free.nrw.commons.contributions.Contribution.STATE_FAILED;
65+
import static fr.free.nrw.commons.contributions.MainActivity.CONTRIBUTIONS_TAB_POSITION;
66+
import static fr.free.nrw.commons.utils.LengthUtils.formatDistanceBetween;
67+
6568
public class ContributionsFragment
6669
extends CommonsDaggerSupportFragment
6770
implements
@@ -72,7 +75,6 @@ public class ContributionsFragment
7275
ICampaignsView, ContributionsContract.View {
7376
@Inject @Named("default_preferences") JsonKvStore store;
7477
@Inject ContributionDao contributionDao;
75-
@Inject MediaWikiApi mediaWikiApi;
7678
@Inject NearbyController nearbyController;
7779
@Inject OkHttpJsonApiClient okHttpJsonApiClient;
7880
@Inject CampaignsPresenter presenter;

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,12 @@
1010
import android.database.Cursor;
1111
import android.os.Bundle;
1212
import android.os.RemoteException;
13-
import android.text.TextUtils;
14-
15-
import org.wikipedia.dataclient.mwapi.MwQueryLogEvent;
16-
import org.wikipedia.dataclient.mwapi.MwQueryResult;
17-
import org.wikipedia.util.DateUtil;
18-
19-
import java.io.IOException;
20-
import java.util.ArrayList;
21-
import java.util.Date;
22-
import java.util.List;
2313

2414
import javax.inject.Inject;
2515
import javax.inject.Named;
2616

27-
import fr.free.nrw.commons.Utils;
2817
import fr.free.nrw.commons.di.ApplicationlessInjection;
2918
import fr.free.nrw.commons.kvstore.JsonKvStore;
30-
import fr.free.nrw.commons.mwapi.LogEventResult;
31-
import fr.free.nrw.commons.mwapi.MediaWikiApi;
3219
import fr.free.nrw.commons.mwapi.UserClient;
3320
import timber.log.Timber;
3421

app/src/main/java/fr/free/nrw/commons/di/NetworkingModule.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
import fr.free.nrw.commons.category.CategoryInterface;
2828
import fr.free.nrw.commons.kvstore.JsonKvStore;
2929
import fr.free.nrw.commons.media.MediaInterface;
30-
import fr.free.nrw.commons.mwapi.ApacheHttpClientMediaWikiApi;
31-
import fr.free.nrw.commons.mwapi.MediaWikiApi;
3230
import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
3331
import fr.free.nrw.commons.mwapi.UserInterface;
3432
import fr.free.nrw.commons.review.ReviewInterface;
@@ -78,14 +76,6 @@ public HttpLoggingInterceptor provideHttpLoggingInterceptor() {
7876
return httpLoggingInterceptor;
7977
}
8078

81-
@Provides
82-
@Singleton
83-
public MediaWikiApi provideMediaWikiApi(Context context,
84-
@Named("default_preferences") JsonKvStore defaultKvStore,
85-
Gson gson) {
86-
return new ApacheHttpClientMediaWikiApi(BuildConfig.WIKIMEDIA_API_HOST);
87-
}
88-
8979
@Provides
9080
@Singleton
9181
public OkHttpJsonApiClient provideOkHttpJsonApiClient(OkHttpClient okHttpClient,

app/src/main/java/fr/free/nrw/commons/explore/categories/SearchCategoryFragment.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33

44
import android.content.res.Configuration;
55
import android.os.Bundle;
6-
import androidx.recyclerview.widget.GridLayoutManager;
7-
import androidx.recyclerview.widget.LinearLayoutManager;
8-
import androidx.recyclerview.widget.RecyclerView;
96
import android.view.LayoutInflater;
107
import android.view.View;
118
import android.view.ViewGroup;
129
import android.widget.ProgressBar;
1310
import android.widget.TextView;
1411

12+
import androidx.recyclerview.widget.GridLayoutManager;
13+
import androidx.recyclerview.widget.LinearLayoutManager;
14+
import androidx.recyclerview.widget.RecyclerView;
15+
1516
import com.pedrogomez.renderers.RVRendererAdapter;
1617

1718
import java.util.ArrayList;
@@ -31,10 +32,8 @@
3132
import fr.free.nrw.commons.explore.recentsearches.RecentSearch;
3233
import fr.free.nrw.commons.explore.recentsearches.RecentSearchesDao;
3334
import fr.free.nrw.commons.kvstore.JsonKvStore;
34-
import fr.free.nrw.commons.mwapi.MediaWikiApi;
3535
import fr.free.nrw.commons.utils.NetworkUtils;
3636
import fr.free.nrw.commons.utils.ViewUtil;
37-
import io.reactivex.Observable;
3837
import io.reactivex.android.schedulers.AndroidSchedulers;
3938
import io.reactivex.schedulers.Schedulers;
4039
import timber.log.Timber;
@@ -62,7 +61,6 @@ public class SearchCategoryFragment extends CommonsDaggerSupportFragment {
6261
boolean isLoadingCategories;
6362

6463
@Inject RecentSearchesDao recentSearchesDao;
65-
@Inject MediaWikiApi mwApi;
6664
@Inject CategoryClient categoryClient;
6765

6866
@Inject

app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java

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

3-
import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
4-
import static android.content.Context.DOWNLOAD_SERVICE;
5-
import static fr.free.nrw.commons.Utils.handleWebUrl;
6-
73
import android.annotation.SuppressLint;
84
import android.app.DownloadManager;
95
import android.content.Intent;
@@ -18,10 +14,15 @@
1814
import android.view.View;
1915
import android.view.ViewGroup;
2016
import android.widget.Toast;
17+
2118
import androidx.fragment.app.Fragment;
2219
import androidx.fragment.app.FragmentManager;
2320
import androidx.fragment.app.FragmentStatePagerAdapter;
2421
import androidx.viewpager.widget.ViewPager;
22+
23+
import javax.inject.Inject;
24+
import javax.inject.Named;
25+
2526
import butterknife.BindView;
2627
import butterknife.ButterKnife;
2728
import fr.free.nrw.commons.Media;
@@ -37,18 +38,18 @@
3738
import fr.free.nrw.commons.explore.SearchActivity;
3839
import fr.free.nrw.commons.explore.categories.ExploreActivity;
3940
import fr.free.nrw.commons.kvstore.JsonKvStore;
40-
import fr.free.nrw.commons.mwapi.MediaWikiApi;
4141
import fr.free.nrw.commons.utils.ImageUtils;
4242
import fr.free.nrw.commons.utils.NetworkUtils;
4343
import fr.free.nrw.commons.utils.PermissionUtils;
4444
import fr.free.nrw.commons.utils.ViewUtil;
45-
import javax.inject.Inject;
46-
import javax.inject.Named;
4745
import timber.log.Timber;
4846

47+
import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
48+
import static android.content.Context.DOWNLOAD_SERVICE;
49+
import static fr.free.nrw.commons.Utils.handleWebUrl;
50+
4951
public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment implements ViewPager.OnPageChangeListener {
5052

51-
@Inject MediaWikiApi mwApi;
5253
@Inject SessionManager sessionManager;
5354
@Inject @Named("default_preferences") JsonKvStore store;
5455
@Inject BookmarkPicturesDao bookmarkDao;

0 commit comments

Comments
 (0)