Skip to content

Commit 2f9a719

Browse files
maskaravivekashishkumar468
authored andcommitted
Remove unused code from the app (commons-app#3276)
1 parent bb0a219 commit 2f9a719

27 files changed

+49
-610
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.OkHttpJsonApiClient;
109
import io.reactivex.Single;
1110
import timber.log.Timber;
1211

@@ -18,13 +17,10 @@
1817
*/
1918
@Singleton
2019
public class MediaDataExtractor {
21-
private final OkHttpJsonApiClient okHttpJsonApiClient;
2220
private final MediaClient mediaClient;
2321

2422
@Inject
25-
public MediaDataExtractor(OkHttpJsonApiClient okHttpJsonApiClient,
26-
MediaClient mediaClient) {
27-
this.okHttpJsonApiClient = okHttpJsonApiClient;
23+
public MediaDataExtractor(MediaClient mediaClient) {
2824
this.mediaClient = mediaClient;
2925
}
3026

app/src/main/java/fr/free/nrw/commons/achievements/Achievements.java

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
*/
66
public class Achievements {
77
private int uniqueUsedImages;
8-
private int articlesUsingImages;
98
private int thanksReceived;
10-
private int imagesEditedBySomeoneElse;
119
private int featuredImages;
1210
private int imagesUploaded;
1311
private int revertCount;
@@ -19,24 +17,18 @@ public Achievements(){
1917
/**
2018
* constructor for achievements class to set its data members
2119
* @param uniqueUsedImages
22-
* @param articlesUsingImages
2320
* @param thanksReceived
24-
* @param imagesEditedBySomeoneElse
2521
* @param featuredImages
2622
* @param imagesUploaded
2723
* @param revertCount
2824
*/
2925
public Achievements(int uniqueUsedImages,
30-
int articlesUsingImages,
3126
int thanksReceived,
32-
int imagesEditedBySomeoneElse,
3327
int featuredImages,
3428
int imagesUploaded,
3529
int revertCount) {
3630
this.uniqueUsedImages = uniqueUsedImages;
37-
this.articlesUsingImages = articlesUsingImages;
3831
this.thanksReceived = thanksReceived;
39-
this.imagesEditedBySomeoneElse = imagesEditedBySomeoneElse;
4032
this.featuredImages = featuredImages;
4133
this.imagesUploaded = imagesUploaded;
4234
this.revertCount = revertCount;
@@ -50,9 +42,7 @@ public Achievements(int uniqueUsedImages,
5042
*/
5143
public static Achievements from(FeedbackResponse response) {
5244
return new Achievements(response.getUniqueUsedImages(),
53-
response.getArticlesUsingImages(),
5445
response.getThanksReceived(),
55-
response.getImagesEditedBySomeoneElse(),
5646
response.getFeaturedImages().getQualityImages()
5747
+ response.getFeaturedImages().getFeaturedPicturesOnWikimediaCommons(),
5848
0,
@@ -99,54 +89,6 @@ public void setImagesUploaded(int imagesUploaded) {
9989
this.imagesUploaded = imagesUploaded;
10090
}
10191

102-
/**
103-
* setter function to set count of featured images
104-
* @param featuredImages
105-
*/
106-
public void setFeaturedImages(int featuredImages) {
107-
this.featuredImages = featuredImages;
108-
}
109-
110-
/**
111-
* setter function to set the count of images edited by someone
112-
* @param imagesEditedBySomeoneElse
113-
*/
114-
public void setImagesEditedBySomeoneElse(int imagesEditedBySomeoneElse) {
115-
this.imagesEditedBySomeoneElse = imagesEditedBySomeoneElse;
116-
}
117-
118-
/**
119-
* setter function to set count of thanks received
120-
* @param thanksReceived
121-
*/
122-
public void setThanksReceived(int thanksReceived) {
123-
this.thanksReceived = thanksReceived;
124-
}
125-
126-
/**
127-
* setter function to count of articles using images uploaded
128-
* @param articlesUsingImages
129-
*/
130-
public void setArticlesUsingImages(int articlesUsingImages) {
131-
this.articlesUsingImages = articlesUsingImages;
132-
}
133-
134-
/**
135-
* setter function to set count of uniques images used by wiki
136-
* @param uniqueUsedImages
137-
*/
138-
public void setUniqueUsedImages(int uniqueUsedImages) {
139-
this.uniqueUsedImages = uniqueUsedImages;
140-
}
141-
142-
/**
143-
* to set count of images reverted
144-
* @param revertCount
145-
*/
146-
public void setRevertCount(int revertCount) {
147-
this.revertCount = revertCount;
148-
}
149-
15092
/**
15193
* used to calculate the percentages of images that haven't been reverted
15294
* @return

app/src/main/java/fr/free/nrw/commons/achievements/FeedbackResponse.java

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,26 @@
22

33
public class FeedbackResponse {
44

5-
private final String status;
65
private final int uniqueUsedImages;
76
private final int articlesUsingImages;
87
private final int deletedUploads;
98
private final FeaturedImages featuredImages;
109
private final int thanksReceived;
1110
private final String user;
12-
private final int imagesEditedBySomeoneElse;
1311

1412

15-
public FeedbackResponse(String status,
16-
int uniqueUsedImages,
13+
public FeedbackResponse(int uniqueUsedImages,
1714
int articlesUsingImages,
1815
int deletedUploads,
1916
FeaturedImages featuredImages,
2017
int thanksReceived,
21-
String user,
22-
int imagesEditedBySomeoneElse) {
23-
this.status = status;
18+
String user) {
2419
this.uniqueUsedImages = uniqueUsedImages;
2520
this.articlesUsingImages = articlesUsingImages;
2621
this.deletedUploads = deletedUploads;
2722
this.featuredImages = featuredImages;
2823
this.thanksReceived = thanksReceived;
2924
this.user = user;
30-
this.imagesEditedBySomeoneElse = imagesEditedBySomeoneElse;
31-
}
32-
33-
public String getStatus() {
34-
return status;
3525
}
3626

3727
public int getUniqueUsedImages() {
@@ -58,7 +48,4 @@ public String getUser() {
5848
return user;
5949
}
6050

61-
public int getImagesEditedBySomeoneElse() {
62-
return imagesEditedBySomeoneElse;
63-
}
6451
}

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
public class AccountUtil {
1212

13-
public static final String AUTH_COOKIE = "authCookie";
1413
public static final String AUTH_TOKEN_TYPE = "CommonsAndroid";
1514

1615
public AccountUtil() {
@@ -38,12 +37,6 @@ public static String getUserName(Context context) {
3837
return account == null ? null : account.name;
3938
}
4039

41-
@Nullable
42-
public static String getPassword(Context context) {
43-
Account account = account(context);
44-
return account == null ? null : accountManager(context).getPassword(account);
45-
}
46-
4740
private static AccountManager accountManager(Context context) {
4841
return AccountManager.get(context);
4942
}

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import android.content.Context;
1010
import android.content.Intent;
1111
import android.os.Bundle;
12+
1213
import androidx.annotation.NonNull;
1314
import androidx.annotation.Nullable;
1415

@@ -109,16 +110,6 @@ private Bundle addAccount(AccountAuthenticatorResponse response) {
109110
return bundle;
110111
}
111112

112-
private Bundle unsupportedOperation() {
113-
Bundle bundle = new Bundle();
114-
bundle.putInt(AccountManager.KEY_ERROR_CODE, AccountManager.ERROR_CODE_UNSUPPORTED_OPERATION);
115-
116-
// HACK: the docs indicate that this is a required key bit it's not displayed to the user.
117-
bundle.putString(AccountManager.KEY_ERROR_MESSAGE, "");
118-
119-
return bundle;
120-
}
121-
122113
@Override
123114
public Bundle getAccountRemovalAllowed(AccountAuthenticatorResponse response,
124115
Account account) throws NetworkErrorException {

app/src/main/java/fr/free/nrw/commons/bookmarks/Bookmark.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,4 @@ public Uri getContentUri() {
4040
return contentUri;
4141
}
4242

43-
/**
44-
* Modifies the content URI - marking this bookmark as already saved in the database
45-
* @param contentUri the content URI
46-
*/
47-
public void setContentUri(Uri contentUri) {
48-
this.contentUri = contentUri;
49-
}
5043
}

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

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

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

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

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,6 @@ public void writeToParcel(Parcel parcel, int flags) {
120120
parcel.writeInt(isMultiple ? 1 : 0);
121121
}
122122

123-
public String getDateCreatedSource() {
124-
return dateCreatedSource;
125-
}
126-
127123
public void setDateCreatedSource(String dateCreatedSource) {
128124
this.dateCreatedSource = dateCreatedSource;
129125
}
@@ -241,14 +237,6 @@ public void setSource(String source) {
241237
this.source = source;
242238
}
243239

244-
public void setLocalUri(Uri localUri) {
245-
this.localUri = localUri;
246-
}
247-
248-
public void setDecimalCoords(String decimalCoords) {
249-
this.decimalCoords = decimalCoords;
250-
}
251-
252240
@NonNull
253241
private String licenseTemplateFor(String license) {
254242
switch (license) {
@@ -284,7 +272,4 @@ public void setContentProviderUri(Uri contentProviderUri) {
284272
this.contentProviderUri = contentProviderUri;
285273
}
286274

287-
public Uri getContentProviderUri() {
288-
return contentProviderUri;
289-
}
290275
}

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

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
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;
106
import android.content.Intent;
117
import android.content.ServiceConnection;
12-
import android.database.DataSetObserver;
138
import android.os.Bundle;
149
import android.os.IBinder;
1510
import android.view.LayoutInflater;
1611
import android.view.View;
1712
import android.view.ViewGroup;
1813
import android.widget.CheckBox;
1914
import android.widget.Toast;
15+
2016
import androidx.annotation.NonNull;
2117
import androidx.annotation.Nullable;
2218
import androidx.fragment.app.Fragment;
2319
import androidx.fragment.app.FragmentManager;
2420
import androidx.fragment.app.FragmentManager.OnBackStackChangedListener;
2521
import androidx.fragment.app.FragmentTransaction;
22+
23+
import javax.inject.Inject;
24+
import javax.inject.Named;
25+
2626
import butterknife.BindView;
2727
import butterknife.ButterKnife;
2828
import fr.free.nrw.commons.HandlerService;
@@ -56,11 +56,12 @@
5656
import io.reactivex.android.schedulers.AndroidSchedulers;
5757
import io.reactivex.disposables.CompositeDisposable;
5858
import io.reactivex.schedulers.Schedulers;
59-
import java.util.ArrayList;
60-
import javax.inject.Inject;
61-
import javax.inject.Named;
6259
import timber.log.Timber;
6360

61+
import static fr.free.nrw.commons.contributions.Contribution.STATE_FAILED;
62+
import static fr.free.nrw.commons.contributions.MainActivity.CONTRIBUTIONS_TAB_POSITION;
63+
import static fr.free.nrw.commons.utils.LengthUtils.formatDistanceBetween;
64+
6465
public class ContributionsFragment
6566
extends CommonsDaggerSupportFragment
6667
implements
@@ -76,7 +77,6 @@ public class ContributionsFragment
7677
@Inject CampaignsPresenter presenter;
7778
@Inject LocationServiceManager locationManager;
7879

79-
private ArrayList<DataSetObserver> observersWaitingForLoad = new ArrayList<>();
8080
private UploadService uploadService;
8181
private boolean isUploadServiceConnected;
8282
private CompositeDisposable compositeDisposable = new CompositeDisposable();
@@ -371,10 +371,6 @@ private void displayUploadCount(Integer uploadCount) {
371371

372372
}
373373

374-
public void betaSetUploadCount(int betaUploadCount) {
375-
displayUploadCount(betaUploadCount);
376-
}
377-
378374
@Override
379375
public void onPause() {
380376
super.onPause();

0 commit comments

Comments
 (0)