Skip to content

Commit 480c05b

Browse files
ronanb80maskaravivek
ronanb80
authored and
maskaravivek
committed
Fix Lint Issues commons-app#171: Fix numerous errors/warnings (commons-app#2537)
1 parent d9fa312 commit 480c05b

18 files changed

+35
-43
lines changed

‎app/src/main/java/fr/free/nrw/commons/campaigns/CampaignsPresenter.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package fr.free.nrw.commons.campaigns;
22

33
import android.annotation.SuppressLint;
4-
import android.util.Log;
54

65
import java.text.ParseException;
76
import java.text.SimpleDateFormat;
@@ -20,6 +19,7 @@
2019
import io.reactivex.android.schedulers.AndroidSchedulers;
2120
import io.reactivex.disposables.Disposable;
2221
import io.reactivex.schedulers.Schedulers;
22+
import timber.log.Timber;
2323

2424
/**
2525
* The presenter for the campaigns view, fetches the campaigns from the api and informs the view on
@@ -29,7 +29,6 @@
2929
public class CampaignsPresenter implements BasePresenter {
3030
private final OkHttpJsonApiClient okHttpJsonApiClient;
3131

32-
private final String TAG = "#CampaignsPresenter#";
3332
private ICampaignsView view;
3433
private Disposable disposable;
3534
private Campaign campaign;
@@ -74,7 +73,7 @@ public void getCampaigns() {
7473
List<Campaign> campaigns = campaignResponseDTO.getCampaigns();
7574
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
7675
if (campaigns == null || campaigns.isEmpty()) {
77-
Log.e(TAG, "The campaigns list is empty");
76+
Timber.e("The campaigns list is empty");
7877
view.showCampaigns(null);
7978
}
8079
Collections.sort(campaigns, (campaign, t1) -> {
@@ -108,7 +107,7 @@ public void getCampaigns() {
108107
}
109108

110109
@Override public void onError(Throwable e) {
111-
Log.e(TAG, "could not fetch campaigns: " + e.getMessage());
110+
Timber.e(e.getMessage(), "could not fetch campaigns");
112111
}
113112
});
114113
}

‎app/src/main/java/fr/free/nrw/commons/category/CategoriesRenderer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package fr.free.nrw.commons.category;
22

3-
import android.util.Log;
43
import android.view.LayoutInflater;
54
import android.view.View;
65
import android.view.ViewGroup;
@@ -11,6 +10,7 @@
1110
import butterknife.BindView;
1211
import butterknife.ButterKnife;
1312
import fr.free.nrw.commons.R;
13+
import timber.log.Timber;
1414

1515
public class CategoriesRenderer extends Renderer<CategoryItem> {
1616
@BindView(R.id.tvName) CheckedTextView checkedView;
@@ -45,7 +45,7 @@ protected void hookListeners(View view) {
4545
@Override
4646
public void render() {
4747
CategoryItem item = getContent();
48-
Log.e("Commons", "Rendering: "+item);
48+
Timber.e("Rendering: %s", item);
4949
checkedView.setChecked(item.isSelected());
5050
checkedView.setText(item.getName());
5151
}

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import android.support.v4.content.Loader;
2222
import android.support.v4.widget.CursorAdapter;
2323
import android.support.v7.app.AlertDialog;
24-
import android.util.Log;
2524
import android.view.LayoutInflater;
2625
import android.view.View;
2726
import android.view.ViewGroup;
@@ -178,15 +177,15 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
178177
@Override public void onFragmentResumed(FragmentManager fm, Fragment f) {
179178
super.onFragmentResumed(fm, f);
180179
//If media detail pager fragment is visible, hide the campaigns view [might not be the best way to do, this but yeah, this proves to work for now]
181-
Log.e("#CF#", "onFragmentResumed" + f.getClass().getName());
180+
Timber.e("onFragmentResumed %s", f.getClass().getName());
182181
if (f instanceof MediaDetailPagerFragment) {
183182
campaignView.setVisibility(View.GONE);
184183
}
185184
}
186185

187186
@Override public void onFragmentDetached(FragmentManager fm, Fragment f) {
188187
super.onFragmentDetached(fm, f);
189-
Log.e("#CF#", "onFragmentDetached" + f.getClass().getName());
188+
Timber.e("onFragmentDetached %s", f.getClass().getName());
190189
//If media detail pager fragment is detached, ContributionsList fragment is gonna be visible, [becomes tightly coupled though]
191190
if (f instanceof MediaDetailPagerFragment) {
192191
fetchCampaigns();

‎app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ private static Intent createChooserIntent(@NonNull Context context, @Nullable St
152152
}
153153

154154
private static void storeType(@NonNull Context context, int type) {
155-
PreferenceManager.getDefaultSharedPreferences(context).edit().putInt(KEY_TYPE, type).commit();
155+
PreferenceManager.getDefaultSharedPreferences(context).edit().putInt(KEY_TYPE, type).apply();
156156
}
157157

158158
private static int restoreType(@NonNull Context context) {

‎app/src/main/java/fr/free/nrw/commons/filepicker/FilePickerConfiguration.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,28 @@ public class FilePickerConfiguration implements Constants {
1414
public FilePickerConfiguration setImagesFolderName(String folderName) {
1515
PreferenceManager.getDefaultSharedPreferences(context)
1616
.edit().putString(BundleKeys.FOLDER_NAME, folderName)
17-
.commit();
17+
.apply();
1818
return this;
1919
}
2020

2121
public FilePickerConfiguration setAllowMultiplePickInGallery(boolean allowMultiple) {
2222
PreferenceManager.getDefaultSharedPreferences(context).edit()
2323
.putBoolean(BundleKeys.ALLOW_MULTIPLE, allowMultiple)
24-
.commit();
24+
.apply();
2525
return this;
2626
}
2727

2828
public FilePickerConfiguration setCopyTakenPhotosToPublicGalleryAppFolder(boolean copy) {
2929
PreferenceManager.getDefaultSharedPreferences(context).edit()
3030
.putBoolean(BundleKeys.COPY_TAKEN_PHOTOS, copy)
31-
.commit();
31+
.apply();
3232
return this;
3333
}
3434

3535
public FilePickerConfiguration setCopyPickedImagesToPublicGalleryAppFolder(boolean copy) {
3636
PreferenceManager.getDefaultSharedPreferences(context).edit()
3737
.putBoolean(BundleKeys.COPY_PICKED_IMAGES, copy)
38-
.commit();
38+
.apply();
3939
return this;
4040
}
4141

‎app/src/main/java/fr/free/nrw/commons/filepicker/PickedFiles.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import android.os.Environment;
88
import android.support.annotation.NonNull;
99
import android.support.v4.content.FileProvider;
10-
import android.util.Log;
1110
import android.webkit.MimeTypeMap;
1211

1312
import java.io.File;
@@ -22,6 +21,8 @@
2221
import java.util.List;
2322
import java.util.UUID;
2423

24+
import timber.log.Timber;
25+
2526

2627
class PickedFiles implements Constants {
2728

@@ -101,8 +102,8 @@ static void scanCopiedImages(Context context, List<File> copiedImages) {
101102
paths, null,
102103
new MediaScannerConnection.OnScanCompletedListener() {
103104
public void onScanCompleted(String path, Uri uri) {
104-
Log.d(getClass().getSimpleName(), "Scanned " + path + ":");
105-
Log.d(getClass().getSimpleName(), "-> uri=" + uri);
105+
Timber.d("Scanned " + path + ":");
106+
Timber.d("-> uri=%s", uri);
106107
}
107108
});
108109
}

‎app/src/main/java/fr/free/nrw/commons/upload/SimilarImageDialogFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ public class SimilarImageDialogFragment extends DialogFragment {
4747
public SimilarImageDialogFragment() {
4848
}
4949
public interface onResponse{
50-
public void onPositiveResponse();
50+
void onPositiveResponse();
5151

52-
public void onNegativeResponse();
52+
void onNegativeResponse();
5353
}
5454

5555
@Override

‎app/src/main/java/fr/free/nrw/commons/utils/SwipableCardView.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
import android.support.annotation.Nullable;
77
import android.support.v7.widget.CardView;
88
import android.util.AttributeSet;
9-
import android.util.Log;
109
import android.view.MotionEvent;
1110
import android.view.View;
1211

12+
import timber.log.Timber;
13+
1314
/**
1415
* A card view which informs onSwipe events to its child
1516
*/
@@ -37,7 +38,7 @@ private void interceptOnTouchListener() {
3738
this.setOnTouchListener((v, event) -> {
3839
boolean isSwipe = false;
3940
float deltaX = 0.0f;
40-
Log.e("#SwipableCardView#", event.getAction() + "");
41+
Timber.e(event.getAction() + "");
4142
switch (event.getAction()) {
4243
case MotionEvent.ACTION_DOWN:
4344
x1 = event.getX();

‎app/src/main/res/layout-land/activity_nearby.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<FrameLayout
3838
android:id="@+id/container"
3939
android:layout_width="match_parent"
40-
android:layout_height="match_parent"></FrameLayout>
40+
android:layout_height="match_parent" />
4141

4242
</LinearLayout>
4343
<View

‎app/src/main/res/layout/bottom_sheet_nearby.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
android:layout_marginRight="16dp"
4747
android:layout_marginBottom="8dp"
4848
android:layout_marginTop="8dp"
49-
android:visibility="gone"
50-
></FrameLayout>
49+
android:visibility="gone" />
5150

5251
</LinearLayout>

‎app/src/main/res/layout/fragment_contributions.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
android:layout_width="match_parent"
1818
android:layout_height="wrap_content"
1919
android:layout_marginTop="2dp"
20-
app:cardBackgroundColor="?attr/mainCardBackground"
21-
></fr.free.nrw.commons.campaigns.CampaignView>
20+
app:cardBackgroundColor="?attr/mainCardBackground" />
2221

2322
<FrameLayout
2423
android:id="@+id/root_frame"

‎app/src/main/res/layout/row_item_languages_spinner.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
/>
2424

2525
<View
26-
android:id="@+id/view"
27-
android:layout_width="match_parent"
28-
android:layout_height="1dp"
29-
android:background="@color/item_white_background"></View>
26+
android:id="@+id/view"
27+
android:layout_width="match_parent"
28+
android:layout_height="1dp"
29+
android:background="@color/item_white_background" />
3030
</LinearLayout>

‎app/src/main/res/xml/pic_of_day_app_widget_info.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<appwidget-provider
3-
xmlns:android="http://schemas.android.com/apk/res/android"
2+
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
43
android:initialKeyguardLayout="@layout/pic_of_day_app_widget"
54
android:initialLayout="@layout/pic_of_day_app_widget"
65
android:minHeight="250dp"
76
android:minWidth="250dp"
87
android:previewImage="@drawable/ic_launcher"
98
android:resizeMode="horizontal|vertical"
109
android:updatePeriodMillis="86400000"
11-
android:widgetCategory="home_screen"></appwidget-provider>
10+
android:widgetCategory="home_screen" />

‎app/src/test/kotlin/fr/free/nrw/commons/TestCommonsApplication.kt

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import fr.free.nrw.commons.kvstore.BasicKvStore
1616
import fr.free.nrw.commons.kvstore.JsonKvStore
1717
import fr.free.nrw.commons.location.LocationServiceManager
1818
import fr.free.nrw.commons.mwapi.MediaWikiApi
19-
import fr.free.nrw.commons.nearby.NearbyPlaces
2019
import fr.free.nrw.commons.upload.UploadController
2120

2221
class TestCommonsApplication : CommonsApplication() {

‎app/src/test/kotlin/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApiTest.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ class ApacheHttpClientMediaWikiApiTest {
246246
fun isUserBlockedFromCommonsForInfinitelyBlockedUser() {
247247
server.enqueue(MockResponse().setBody("<?xml version=\"1.0\"?><api><query><userinfo id=\"1000\" name=\"testusername\" blockid=\"3000\" blockedby=\"blockerusername\" blockedbyid=\"1001\" blockreason=\"testing\" blockedtimestamp=\"2018-05-24T15:32:09Z\" blockexpiry=\"infinite\"></userinfo></query></api>"))
248248

249-
val result = testObject.isUserBlockedFromCommons();
249+
val result = testObject.isUserBlockedFromCommons()
250250

251251
assertBasicRequestParameters(server, "GET").let { userBlockedRequest ->
252252
parseQueryParams(userBlockedRequest).let { body ->
@@ -268,7 +268,7 @@ class ApacheHttpClientMediaWikiApiTest {
268268
dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"))
269269
server.enqueue(MockResponse().setBody("<?xml version=\"1.0\"?><api><query><userinfo id=\"1000\" name=\"testusername\" blockid=\"3000\" blockedby=\"blockerusername\" blockedbyid=\"1001\" blockreason=\"testing\" blockedtimestamp=\"2018-05-24T15:32:09Z\" blockexpiry=\"" + dateFormat.format(expiredDate) + "\"></userinfo></query></api>"))
270270

271-
val result = testObject.isUserBlockedFromCommons();
271+
val result = testObject.isUserBlockedFromCommons()
272272

273273
assertBasicRequestParameters(server, "GET").let { userBlockedRequest ->
274274
parseQueryParams(userBlockedRequest).let { body ->
@@ -290,7 +290,7 @@ class ApacheHttpClientMediaWikiApiTest {
290290
dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"))
291291
server.enqueue(MockResponse().setBody("<?xml version=\"1.0\"?><api><query><userinfo id=\"1000\" name=\"testusername\" blockid=\"3000\" blockedby=\"blockerusername\" blockedbyid=\"1001\" blockreason=\"testing\" blockedtimestamp=\"2018-05-24T15:32:09Z\" blockexpiry=\"" + dateFormat.format(expiredDate) + "\"></userinfo></query></api>"))
292292

293-
val result = testObject.isUserBlockedFromCommons();
293+
val result = testObject.isUserBlockedFromCommons()
294294

295295
assertBasicRequestParameters(server, "GET").let { userBlockedRequest ->
296296
parseQueryParams(userBlockedRequest).let { body ->
@@ -308,7 +308,7 @@ class ApacheHttpClientMediaWikiApiTest {
308308
fun isUserBlockedFromCommonsForNotBlockedUser() {
309309
server.enqueue(MockResponse().setBody("<?xml version=\"1.0\"?><api><query><userinfo id=\"1000\" name=\"testusername\"></userinfo></query></api>"))
310310

311-
val result = testObject.isUserBlockedFromCommons();
311+
val result = testObject.isUserBlockedFromCommons()
312312

313313
assertBasicRequestParameters(server, "GET").let { userBlockedRequest ->
314314
parseQueryParams(userBlockedRequest).let { body ->

‎app/src/test/kotlin/fr/free/nrw/commons/upload/FileProcessorTest.kt

-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
package fr.free.nrw.commons.upload
22

3-
import android.content.ContentResolver
43
import android.content.SharedPreferences
54
import fr.free.nrw.commons.caching.CacheController
65
import fr.free.nrw.commons.mwapi.CategoryApi
76
import org.junit.Before
87
import org.junit.Test
98
import org.mockito.InjectMocks
109
import org.mockito.Mock
11-
import org.mockito.Mockito.anyString
12-
import org.mockito.Mockito.mock
1310
import org.mockito.MockitoAnnotations
1411
import javax.inject.Inject
1512
import javax.inject.Named

‎app/src/test/kotlin/fr/free/nrw/commons/upload/UploadControllerTest.kt

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package fr.free.nrw.commons.upload
22

33
import android.content.ComponentName
44
import android.content.Context
5-
import android.content.SharedPreferences
65
import fr.free.nrw.commons.HandlerService
76
import fr.free.nrw.commons.auth.SessionManager
87
import fr.free.nrw.commons.contributions.Contribution

‎app/src/test/kotlin/fr/free/nrw/commons/upload/UploadModelTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class UploadModelTest {
7070
`when`(fileUtilsWrapper!!.getGeolocationOfFile(anyString()))
7171
.thenReturn("")
7272
`when`(imageProcessingService!!.validateImage(any(UploadModel.UploadItem::class.java), anyBoolean()))
73-
.thenReturn(Single.just(IMAGE_OK));
73+
.thenReturn(Single.just(IMAGE_OK))
7474

7575
}
7676

0 commit comments

Comments
 (0)