From 846177a7b8ac62faed54a3210b83bcfcd1f0cc45 Mon Sep 17 00:00:00 2001 From: Yash Khare Date: Thu, 13 Feb 2020 02:55:52 +0530 Subject: [PATCH] Fixes #3405 Added spotlessCheck test to travis --- .travis.yml | 3 ++- app/build.gradle | 2 ++ .../commons/category/CategoryContentProvider.java | 2 +- .../nrw/commons/contributions/ContributionDao.java | 12 ++++++------ .../contributions/ContributionsContentProvider.java | 2 +- .../commons/contributions/ContributionsFragment.java | 2 +- .../free/nrw/commons/contributions/MainActivity.java | 2 +- .../RecentSearchesContentProvider.java | 2 +- .../commons/nearby/NearbyNotificationCardView.java | 6 +++--- .../nrw/commons/theme/NavigationBaseActivity.java | 2 +- .../LongTitleMultiSelectListPreference.java | 4 ++-- .../java/fr/free/nrw/commons/utils/DialogUtil.java | 2 +- 12 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index ab511cecc5..4adf59693d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,8 @@ android: licenses: - android-sdk-license-.+ script: -- "./gradlew -Pcoverage clean check jacocoTestReport" +- ./gradlew spotlessCheck +- "./gradlew -Pcoverage clean jacocoTestReport" - if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then mkdir -p app/src/prodRelease/play/release-notes/en-US; fi diff --git a/app/build.gradle b/app/build.gradle index 158fe1fdce..9e1b513d45 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,6 +18,7 @@ if(isRunningOnTravisAndIsNotPRBuild) { spotless { java { googleJavaFormat() + indentWithSpaces(4) target '**/*.java' } @@ -45,6 +46,7 @@ dependencies { implementation 'com.facebook.fresco:fresco:1.13.0' implementation 'org.apache.commons:commons-lang3:3.8.1' implementation 'com.github.maskaravivek:wikimedia-android-data-client:v0.0.30' + compileOnly 'com.github.pengrad:jdk9-deps:1.0' // UI implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar' diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java b/app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java index 952b5c8c7a..2a315305c0 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java @@ -145,7 +145,7 @@ outside world (exported="false"). Even then, we should make sure to sanitize In here, the only concat created argument is for id. It is cast to an int, and will error out otherwise. - */ + */ int uriType = uriMatcher.match(uri); SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase(); int rowsUpdated; diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java index 66ba3d0273..378bb33ae2 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java @@ -24,13 +24,13 @@ public class ContributionDao { /* - This sorts in the following order: - Currently Uploading - Failed (Sorted in ascending order of time added - FIFO) - Queued to Upload (Sorted in ascending order of time added - FIFO) - Completed (Sorted in descending order of time added) + This sorts in the following order: + Currently Uploading + Failed (Sorted in ascending order of time added - FIFO) + Queued to Upload (Sorted in ascending order of time added - FIFO) + Completed (Sorted in descending order of time added) - This is why Contribution.STATE_COMPLETED is -1. + This is why Contribution.STATE_COMPLETED is -1. */ static final String CONTRIBUTION_SORT = Table.COLUMN_STATE diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java index c844babc37..3b5c5a4ddc 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java @@ -157,7 +157,7 @@ public int update( In here, the only concat created argument is for id. It is cast to an int, and will error out otherwise. - */ + */ int uriType = uriMatcher.match(uri); SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase(); int rowsUpdated; diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java index 84afa268ec..0e9152d642 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java @@ -267,7 +267,7 @@ public void onAttach(Context context) { all over again on same fragment attached to recreated activity, we do this network operations on first time fragment attached to an activity. Then they will be retained until fragment life time ends. - */ + */ if (!isFragmentAttachedBefore && getActivity() != null) { onAuthCookieAcquired(); isFragmentAttachedBefore = true; diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java index 46a69ba127..87399296ad 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java @@ -90,7 +90,7 @@ public void onCreate(Bundle savedInstanceState) { // If nearby map was visible, call on Tab Selected to call all nearby operations /*if (savedInstanceState.getInt("viewPagerCurrentItem") == 1) { - ((NearbyFragment)contributionsActivityPagerAdapter.getItem(1)).onTabSelected(onOrientationChanged); + ((NearbyFragment)contributionsActivityPagerAdapter.getItem(1)).onTabSelected(onOrientationChanged); }*/ } } diff --git a/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesContentProvider.java b/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesContentProvider.java index 7d5cc20e1d..32b21d51e3 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesContentProvider.java +++ b/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesContentProvider.java @@ -168,7 +168,7 @@ outside world (exported="false"). Even then, we should make sure to sanitize In here, the only concat created argument is for id. It is cast to an int, and will error out otherwise. - */ + */ int uriType = uriMatcher.match(uri); SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase(); int rowsUpdated; diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNotificationCardView.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNotificationCardView.java index b4cbc87c08..d7fee04f50 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNotificationCardView.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNotificationCardView.java @@ -141,9 +141,9 @@ protected void onVisibilityChanged(@NonNull View changedView, int visibility) { super.onVisibilityChanged(changedView, visibility); if (visibility == VISIBLE) { /* - Sometimes we need to preserve previous state of notification card view without getting - any data from user. Ie. wen user came back from Media Details fragment to Contrib List - fragment, we need to know what was the state of card view, and set it to exact same state. + Sometimes we need to preserve previous state of notification card view without getting + any data from user. Ie. wen user came back from Media Details fragment to Contrib List + fragment, we need to know what was the state of card view, and set it to exact same state. */ switch (cardViewVisibilityState) { case READY: diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java index 65e5370adf..8d6cf0d08e 100644 --- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java @@ -311,7 +311,7 @@ public static void startActivityWithFlags(Context context, Class cls, int } /* This is a workaround for a known Android bug which is present in some API levels. - https://issuetracker.google.com/issues/36986021 + https://issuetracker.google.com/issues/36986021 */ @Override protected void onNewIntent(Intent intent) { diff --git a/app/src/main/java/fr/free/nrw/commons/ui/LongTitlePreferences/LongTitleMultiSelectListPreference.java b/app/src/main/java/fr/free/nrw/commons/ui/LongTitlePreferences/LongTitleMultiSelectListPreference.java index 22120f1ed3..1d75f06dda 100644 --- a/app/src/main/java/fr/free/nrw/commons/ui/LongTitlePreferences/LongTitleMultiSelectListPreference.java +++ b/app/src/main/java/fr/free/nrw/commons/ui/LongTitlePreferences/LongTitleMultiSelectListPreference.java @@ -9,11 +9,11 @@ public class LongTitleMultiSelectListPreference extends MultiSelectListPreference { /* public LongTitleMultiSelectListPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); + super(context, attrs, defStyleAttr, defStyleRes); } public LongTitleMultiSelectListPreference(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); + super(context, attrs, defStyleAttr); } */ public LongTitleMultiSelectListPreference(Context context, AttributeSet attrs) { diff --git a/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java b/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java index f3fc4fa2ea..345041ff41 100644 --- a/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java +++ b/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java @@ -114,7 +114,7 @@ public static void showAlertDialog( /* Shows alert dialog with custom view - */ + */ private static void showAlertDialog( Activity activity, String title,