diff --git a/app/src/androidTest/java/fr/free/nrw/commons/upload/FileUtilsTest.java b/app/src/androidTest/java/fr/free/nrw/commons/upload/FileUtilsTest.java index d2db4614f..636d30a1b 100644 --- a/app/src/androidTest/java/fr/free/nrw/commons/upload/FileUtilsTest.java +++ b/app/src/androidTest/java/fr/free/nrw/commons/upload/FileUtilsTest.java @@ -27,4 +27,4 @@ public class FileUtilsTest { boolean selfOwned = FileUtils.isSelfOwned(InstrumentationRegistry.getTargetContext(), uri); assertThat(selfOwned, is(false)); } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java b/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java index 74247a02f..109d115d4 100644 --- a/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java @@ -33,7 +33,7 @@ public class WelcomeActivity extends BaseActivity { moreInformation = this.getString(R.string.welcome_help_button_text); - if(getIntent() != null) { + if (getIntent() != null) { Bundle bundle = getIntent().getExtras(); if (bundle != null) { isQuiz = bundle.getBoolean("isQuiz"); @@ -54,7 +54,7 @@ public class WelcomeActivity extends BaseActivity { */ @Override public void onDestroy() { - if(isQuiz){ + if (isQuiz){ Intent i = new Intent(WelcomeActivity.this, QuizActivity.class); startActivity(i); } diff --git a/app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java b/app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java index dcedea4ce..f2c6d1054 100644 --- a/app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java @@ -60,15 +60,15 @@ public class WelcomePagerAdapter extends PagerAdapter { this.container=container; LayoutInflater inflater = LayoutInflater.from(container.getContext()); ViewGroup layout = (ViewGroup) inflater.inflate(PAGE_LAYOUTS[position], container, false); - if( BuildConfig.FLAVOR == "beta"){ + if (BuildConfig.FLAVOR == "beta") { TextView textView = layout.findViewById(R.id.welcomeYesButton); - if( textView.getVisibility() != View.VISIBLE){ + if (textView.getVisibility() != View.VISIBLE) { textView.setVisibility(View.VISIBLE); } ViewHolder holder = new ViewHolder(layout); layout.setTag(holder); - if(position == PAGE_FINAL){ + if (position == PAGE_FINAL){ TextView moreInfo = layout.findViewById(R.id.welcomeInfo); moreInfo.setText(Html.fromHtml(WelcomeActivity.moreInformation)); ViewHolder holder1 = new ViewHolder(layout); diff --git a/app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java b/app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java index 70143cbb6..d04d2b7b1 100644 --- a/app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java @@ -185,7 +185,7 @@ public class AchievementsActivity extends NavigationBaseActivity { * which then calls parseJson when results are fetched */ private void setAchievements() { - if(checkAccount()) { + if (checkAccount()) { compositeDisposable.add(mediaWikiApi .getAchievements(Objects.requireNonNull(sessionManager.getCurrentAccount()).name) .subscribeOn(Schedulers.io()) @@ -218,7 +218,7 @@ public class AchievementsActivity extends NavigationBaseActivity { * used to the count of images uploaded by user */ private void setUploadCount(Achievements achievements) { - if(checkAccount()) { + if (checkAccount()) { compositeDisposable.add(mediaWikiApi .getUploadCount(Objects.requireNonNull(sessionManager.getCurrentAccount()).name) .subscribeOn(Schedulers.io()) @@ -387,7 +387,7 @@ public class AchievementsActivity extends NavigationBaseActivity { */ private boolean checkAccount(){ Account currentAccount = sessionManager.getCurrentAccount(); - if(currentAccount == null) { + if (currentAccount == null) { Timber.d("Current account is null"); ViewUtil.showLongToast(this, getResources().getString(R.string.user_not_logged_in)); sessionManager.forceLogin(this); diff --git a/app/src/main/java/fr/free/nrw/commons/achievements/BitmapUtils.java b/app/src/main/java/fr/free/nrw/commons/achievements/BitmapUtils.java index b7400117d..57318a12d 100644 --- a/app/src/main/java/fr/free/nrw/commons/achievements/BitmapUtils.java +++ b/app/src/main/java/fr/free/nrw/commons/achievements/BitmapUtils.java @@ -19,7 +19,7 @@ public class BitmapUtils { */ public static BitmapDrawable writeOnDrawable(Bitmap bm, String text, Context context){ Bitmap.Config config = bm.getConfig(); - if(config == null){ + if (config == null){ config = Bitmap.Config.ARGB_8888; } Bitmap bitmap = Bitmap.createBitmap(bm.getWidth(),bm.getHeight(),config); diff --git a/app/src/main/java/fr/free/nrw/commons/achievements/FeaturedImages.java b/app/src/main/java/fr/free/nrw/commons/achievements/FeaturedImages.java index 8b9992e28..a943ed4a3 100644 --- a/app/src/main/java/fr/free/nrw/commons/achievements/FeaturedImages.java +++ b/app/src/main/java/fr/free/nrw/commons/achievements/FeaturedImages.java @@ -22,4 +22,4 @@ public class FeaturedImages { public int getFeaturedPicturesOnWikimediaCommons() { return featuredPicturesOnWikimediaCommons; } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/achievements/FeedbackResponse.java b/app/src/main/java/fr/free/nrw/commons/achievements/FeedbackResponse.java index 37fea3e2d..b8323f973 100644 --- a/app/src/main/java/fr/free/nrw/commons/achievements/FeedbackResponse.java +++ b/app/src/main/java/fr/free/nrw/commons/achievements/FeedbackResponse.java @@ -61,4 +61,4 @@ public class FeedbackResponse { public int getImagesEditedBySomeoneElse() { return imagesEditedBySomeoneElse; } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java index 371f561ca..55c42a158 100644 --- a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java @@ -139,7 +139,7 @@ public class LoginActivity extends AccountAuthenticatorActivity { .setNegativeButton(R.string.no, (dialog, which) -> dialog.cancel()) .show()); - if(BuildConfig.FLAVOR.equals("beta")){ + if (BuildConfig.FLAVOR.equals("beta")){ loginCredentials.setText(getString(R.string.login_credential)); } else { loginCredentials.setVisibility(View.GONE); @@ -381,10 +381,10 @@ public class LoginActivity extends AccountAuthenticatorActivity { super.onRestoreInstanceState(savedInstanceState); loginCurrentlyInProgress = savedInstanceState.getBoolean(LOGING_IN, false); errorMessageShown = savedInstanceState.getBoolean(ERROR_MESSAGE_SHOWN, false); - if(loginCurrentlyInProgress){ + if (loginCurrentlyInProgress){ performLogin(); } - if(errorMessageShown){ + if (errorMessageShown){ resultantError = savedInstanceState.getString(RESULTANT_ERROR); handleOtherResults(resultantError); } @@ -399,7 +399,7 @@ public class LoginActivity extends AccountAuthenticatorActivity { public void showMessageAndCancelDialog(@StringRes int resId) { showMessage(resId, R.color.secondaryDarkColor); - if(progressDialog != null){ + if (progressDialog != null){ progressDialog.cancel(); } } diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksPagerAdapter.java b/app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksPagerAdapter.java index cad65a87a..b0f94e322 100644 --- a/app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksPagerAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksPagerAdapter.java @@ -63,4 +63,4 @@ public class BookmarksPagerAdapter extends FragmentPagerAdapter { BookmarkPicturesFragment fragment = (BookmarkPicturesFragment)(pages.get(0).getPage()); fragment.onResume(); } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesFragment.java b/app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesFragment.java index 4232c1750..90b3ef457 100644 --- a/app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesFragment.java @@ -105,7 +105,7 @@ public class BookmarkPicturesFragment extends DaggerFragment { */ @SuppressLint("CheckResult") private void initList() { - if(!NetworkUtils.isInternetConnectionEstablished(getContext())) { + if (!NetworkUtils.isInternetConnectionEstablished(getContext())) { handleNoInternet(); return; } @@ -179,7 +179,7 @@ public class BookmarkPicturesFragment extends DaggerFragment { * @param collection List of new Media to be displayed */ private void handleSuccess(List collection) { - if(collection == null) { + if (collection == null) { initErrorView(); return; } @@ -188,7 +188,7 @@ public class BookmarkPicturesFragment extends DaggerFragment { return; } - if(gridAdapter == null) { + if (gridAdapter == null) { setAdapter(collection); } else { if (gridAdapter.containsAll(collection)) { diff --git a/app/src/main/java/fr/free/nrw/commons/category/Category.java b/app/src/main/java/fr/free/nrw/commons/category/Category.java index f2d83d2e5..8ea3c442c 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/Category.java +++ b/app/src/main/java/fr/free/nrw/commons/category/Category.java @@ -93,4 +93,4 @@ public class Category { this.contentUri = contentUri; } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryImageController.java b/app/src/main/java/fr/free/nrw/commons/category/CategoryImageController.java index 3495d710c..ae45952e4 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategoryImageController.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryImageController.java @@ -26,4 +26,4 @@ public class CategoryImageController { public List getCategoryImages(String categoryName) { return mediaWikiApi.getCategoryImages(categoryName); } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryImagesListFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategoryImagesListFragment.java index f24cc0b95..1ead68701 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategoryImagesListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryImagesListFragment.java @@ -101,7 +101,7 @@ public class CategoryImagesListFragment extends DaggerFragment { */ @SuppressLint("CheckResult") private void initList() { - if(!NetworkUtils.isInternetConnectionEstablished(getContext())) { + if (!NetworkUtils.isInternetConnectionEstablished(getContext())) { handleNoInternet(); return; } @@ -208,7 +208,7 @@ public class CategoryImagesListFragment extends DaggerFragment { */ @SuppressLint("CheckResult") private void fetchMoreImages() { - if(!NetworkUtils.isInternetConnectionEstablished(getContext())) { + if (!NetworkUtils.isInternetConnectionEstablished(getContext())) { handleNoInternet(); return; } @@ -227,13 +227,13 @@ public class CategoryImagesListFragment extends DaggerFragment { * @param collection List of new Media to be displayed */ private void handleSuccess(List collection) { - if(collection == null || collection.isEmpty()) { + if (collection == null || collection.isEmpty()) { initErrorView(); hasMoreImages = false; return; } - if(gridAdapter == null) { + if (gridAdapter == null) { setAdapter(collection); } else { if (gridAdapter.containsAll(collection)) { diff --git a/app/src/main/java/fr/free/nrw/commons/category/GridViewAdapter.java b/app/src/main/java/fr/free/nrw/commons/category/GridViewAdapter.java index ca4059e9d..988e992fa 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/GridViewAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/category/GridViewAdapter.java @@ -109,4 +109,4 @@ public class GridViewAdapter extends ArrayAdapter { author.setVisibility(View.GONE); } } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/category/SubCategoryListFragment.java b/app/src/main/java/fr/free/nrw/commons/category/SubCategoryListFragment.java index ed21d011b..984d87fae 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/SubCategoryListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/SubCategoryListFragment.java @@ -73,7 +73,7 @@ public class SubCategoryListFragment extends CommonsDaggerSupportFragment { categoryName = getArguments().getString("categoryName"); isParentCategory = getArguments().getBoolean("isParentCategory"); initSubCategoryList(); - if(getActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT){ + if (getActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT){ categoriesRecyclerView.setLayoutManager(new LinearLayoutManager(getContext())); } else{ @@ -91,7 +91,7 @@ public class SubCategoryListFragment extends CommonsDaggerSupportFragment { */ public void initSubCategoryList() { categoriesNotFoundView.setVisibility(GONE); - if(!NetworkUtils.isInternetConnectionEstablished(getContext())) { + if (!NetworkUtils.isInternetConnectionEstablished(getContext())) { handleNoInternet(); return; } @@ -118,7 +118,7 @@ public class SubCategoryListFragment extends CommonsDaggerSupportFragment { * @param subCategoryList */ private void handleSuccess(List subCategoryList) { - if(subCategoryList == null || subCategoryList.isEmpty()) { + if (subCategoryList == null || subCategoryList.isEmpty()) { initEmptyView(); } else { diff --git a/app/src/main/java/fr/free/nrw/commons/concurrency/ThreadPoolService.java b/app/src/main/java/fr/free/nrw/commons/concurrency/ThreadPoolService.java index e0fd495ef..2cda95a7d 100644 --- a/app/src/main/java/fr/free/nrw/commons/concurrency/ThreadPoolService.java +++ b/app/src/main/java/fr/free/nrw/commons/concurrency/ThreadPoolService.java @@ -121,4 +121,4 @@ public class ThreadPoolService implements Executor { return new ThreadPoolService(this); } } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java index a903c6339..e01942d9f 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java @@ -147,12 +147,12 @@ public class ContributionsActivity setTitle(getString(R.string.title_activity_contributions)); - if(checkAccount()) { + if (checkAccount()) { new QuizChecker(this, sessionManager.getCurrentAccount().name, mediaWikiApi); } - if(!BuildConfig.FLAVOR.equalsIgnoreCase("beta")){ + if (!BuildConfig.FLAVOR.equalsIgnoreCase("beta")){ setUploadCount(); } @@ -256,7 +256,7 @@ public class ContributionsActivity ((CursorAdapter) contributionsList.getAdapter()).swapCursor(cursor); } - if(contributionsList.getAdapter().getCount()>0){ + if (contributionsList.getAdapter().getCount()>0){ contributionsList.changeEmptyScreen(false); } contributionsList.clearSyncMessage(); diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java index a04c1120f..a17db5e80 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java @@ -93,7 +93,7 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment { public void setAdapter(ListAdapter adapter) { this.contributionsList.setAdapter(adapter); - if(BuildConfig.FLAVOR.equalsIgnoreCase("beta")){ + if (BuildConfig.FLAVOR.equalsIgnoreCase("beta")){ ((ContributionsActivity) getActivity()).betaSetUploadCount(adapter.getCount()); } } diff --git a/app/src/main/java/fr/free/nrw/commons/delete/DeleteTask.java b/app/src/main/java/fr/free/nrw/commons/delete/DeleteTask.java index f35a6c38e..81a1e0aba 100644 --- a/app/src/main/java/fr/free/nrw/commons/delete/DeleteTask.java +++ b/app/src/main/java/fr/free/nrw/commons/delete/DeleteTask.java @@ -182,4 +182,4 @@ public class DeleteTask extends AsyncTask { .setPriority(PRIORITY_HIGH); notificationManager.notify(NOTIFICATION_DELETE, notificationBuilder.build()); } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/di/ApplicationlessInjection.java b/app/src/main/java/fr/free/nrw/commons/di/ApplicationlessInjection.java index 2faf09b83..87a0d9da0 100644 --- a/app/src/main/java/fr/free/nrw/commons/di/ApplicationlessInjection.java +++ b/app/src/main/java/fr/free/nrw/commons/di/ApplicationlessInjection.java @@ -90,4 +90,4 @@ public class ApplicationlessInjection return instance; } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java index e6a61f307..a52f6ddab 100644 --- a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java +++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java @@ -173,4 +173,4 @@ public class CommonsApplicationModule { public boolean provideIsBetaVariant() { return BuildConfig.FLAVOR.equals("beta"); } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerAppCompatActivity.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerAppCompatActivity.java index 9f06725de..9287e1bfc 100644 --- a/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerAppCompatActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerAppCompatActivity.java @@ -40,4 +40,4 @@ public abstract class CommonsDaggerAppCompatActivity extends AppCompatActivity i activityInjector.inject(this); } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerBroadcastReceiver.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerBroadcastReceiver.java index 3c4cb9914..10fa74a9b 100644 --- a/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerBroadcastReceiver.java +++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerBroadcastReceiver.java @@ -28,4 +28,4 @@ public abstract class CommonsDaggerBroadcastReceiver extends BroadcastReceiver { serviceInjector.inject(this); } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerContentProvider.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerContentProvider.java index 38506c4ca..06adee489 100644 --- a/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerContentProvider.java +++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerContentProvider.java @@ -29,4 +29,4 @@ public abstract class CommonsDaggerContentProvider extends ContentProvider { serviceInjector.inject(this); } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerIntentService.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerIntentService.java index 995c517a1..41f661db4 100644 --- a/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerIntentService.java +++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerIntentService.java @@ -29,4 +29,4 @@ public abstract class CommonsDaggerIntentService extends IntentService { serviceInjector.inject(this); } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerService.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerService.java index dc6c10b9f..0d045d2ce 100644 --- a/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerService.java +++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerService.java @@ -28,4 +28,4 @@ public abstract class CommonsDaggerService extends Service { serviceInjector.inject(this); } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerSupportFragment.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerSupportFragment.java index 8c33e7a98..3f2556466 100644 --- a/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerSupportFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerSupportFragment.java @@ -62,4 +62,4 @@ public abstract class CommonsDaggerSupportFragment extends Fragment implements H throw new IllegalArgumentException(String.format("No injector was found for %s", getClass().getCanonicalName())); } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/explore/categories/SearchCategoryFragment.java b/app/src/main/java/fr/free/nrw/commons/explore/categories/SearchCategoryFragment.java index 7f2b3ff93..520c55a57 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/categories/SearchCategoryFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/explore/categories/SearchCategoryFragment.java @@ -95,7 +95,7 @@ public class SearchCategoryFragment extends CommonsDaggerSupportFragment { public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) { View rootView = inflater.inflate(R.layout.fragment_browse_image, container, false); ButterKnife.bind(this, rootView); - if(getActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT){ + if (getActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT){ categoriesRecyclerView.setLayoutManager(new LinearLayoutManager(getContext())); } else{ @@ -124,7 +124,7 @@ public class SearchCategoryFragment extends CommonsDaggerSupportFragment { public void updateCategoryList(String query) { this.query = query; categoriesNotFoundView.setVisibility(GONE); - if(!NetworkUtils.isInternetConnectionEstablished(getContext())) { + if (!NetworkUtils.isInternetConnectionEstablished(getContext())) { handleNoInternet(); return; } @@ -173,7 +173,7 @@ public class SearchCategoryFragment extends CommonsDaggerSupportFragment { */ private void handleSuccess(List mediaList) { queryList = mediaList; - if(mediaList == null || mediaList.isEmpty()) { + if (mediaList == null || mediaList.isEmpty()) { initErrorView(); } else { diff --git a/app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java b/app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java index 7c7f1cdd9..43fcf4460 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java @@ -97,7 +97,7 @@ public class SearchImageFragment extends CommonsDaggerSupportFragment { public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) { View rootView = inflater.inflate(R.layout.fragment_browse_image, container, false); ButterKnife.bind(this, rootView); - if(getActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT){ + if (getActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT){ imagesRecyclerView.setLayoutManager(new LinearLayoutManager(getContext())); } else{ @@ -125,10 +125,10 @@ public class SearchImageFragment extends CommonsDaggerSupportFragment { */ public void updateImageList(String query) { this.query = query; - if(imagesNotFoundView != null) { + if (imagesNotFoundView != null) { imagesNotFoundView.setVisibility(GONE); } - if(!NetworkUtils.isInternetConnectionEstablished(getContext())) { + if (!NetworkUtils.isInternetConnectionEstablished(getContext())) { handleNoInternet(); return; } @@ -182,7 +182,7 @@ public class SearchImageFragment extends CommonsDaggerSupportFragment { */ private void handleSuccess(List mediaList) { queryList = mediaList; - if(mediaList == null || mediaList.isEmpty()) { + if (mediaList == null || mediaList.isEmpty()) { initErrorView(); } else { diff --git a/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearch.java b/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearch.java index ed1aa1d6b..ed6fb903a 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearch.java +++ b/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearch.java @@ -68,4 +68,4 @@ public class RecentSearch { this.contentUri = contentUri; } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/logging/CommonsLogSender.java b/app/src/main/java/fr/free/nrw/commons/logging/CommonsLogSender.java index 407014db5..7f4bb2ab7 100644 --- a/app/src/main/java/fr/free/nrw/commons/logging/CommonsLogSender.java +++ b/app/src/main/java/fr/free/nrw/commons/logging/CommonsLogSender.java @@ -42,4 +42,4 @@ public class CommonsLogSender extends LogsSender { return builder.toString(); } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/logging/FileLoggingTree.java b/app/src/main/java/fr/free/nrw/commons/logging/FileLoggingTree.java index ce8174382..8630af4da 100644 --- a/app/src/main/java/fr/free/nrw/commons/logging/FileLoggingTree.java +++ b/app/src/main/java/fr/free/nrw/commons/logging/FileLoggingTree.java @@ -141,4 +141,4 @@ public class FileLoggingTree extends Timber.DebugTree implements LogLevelSettabl LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME); logger.addAppender(rollingFileAppender); } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/logging/LogLevelSettableTree.java b/app/src/main/java/fr/free/nrw/commons/logging/LogLevelSettableTree.java index 83b8854cc..5eeca6d3e 100644 --- a/app/src/main/java/fr/free/nrw/commons/logging/LogLevelSettableTree.java +++ b/app/src/main/java/fr/free/nrw/commons/logging/LogLevelSettableTree.java @@ -5,4 +5,4 @@ package fr.free.nrw.commons.logging; */ public interface LogLevelSettableTree { void setLogLevel(int logLevel); -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/logging/LogUtils.java b/app/src/main/java/fr/free/nrw/commons/logging/LogUtils.java index 21b133aa2..bdf07d392 100644 --- a/app/src/main/java/fr/free/nrw/commons/logging/LogUtils.java +++ b/app/src/main/java/fr/free/nrw/commons/logging/LogUtils.java @@ -16,10 +16,10 @@ public final class LogUtils { * @return */ public static String getLogDirectory(boolean isBeta) { - if(isBeta) { + if (isBeta) { return Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + "/logs/beta"; } else { return Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + "/logs/prod"; } } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/logging/LogsSender.java b/app/src/main/java/fr/free/nrw/commons/logging/LogsSender.java index 16c40cf44..59ddb2523 100644 --- a/app/src/main/java/fr/free/nrw/commons/logging/LogsSender.java +++ b/app/src/main/java/fr/free/nrw/commons/logging/LogsSender.java @@ -180,4 +180,4 @@ public abstract class LogsSender implements ReportSender { zos.flush(); zos.close(); } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index 19b7f2c06..8feed101e 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -253,7 +253,7 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment { @Override protected Boolean doInBackground(Void... voids) { // Local files have no filename yet - if(media.getFilename() == null) { + if (media.getFilename() == null) { return Boolean.FALSE; } try { @@ -325,7 +325,7 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment { } rebuildCatList(); - if(media.getCreator() == null || media.getCreator().equals("")) { + if (media.getCreator() == null || media.getCreator().equals("")) { authorLayout.setVisibility(GONE); } else { author.setText(media.getCreator()); @@ -339,7 +339,7 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment { if (!TextUtils.isEmpty(licenseLink(media))) { openWebBrowser(licenseLink(media)); } else { - if(isCategoryImage) { + if (isCategoryImage) { Timber.d("Unable to fetch license URL for %s", media.getLicense()); } else { Toast toast = Toast.makeText(getContext(), getString(R.string.null_url), Toast.LENGTH_SHORT); @@ -414,14 +414,14 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment { @OnClick(R.id.seeMore) public void onSeeMoreClicked(){ - if(nominatedForDeletion.getVisibility()== VISIBLE) { + if (nominatedForDeletion.getVisibility()== VISIBLE) { openWebBrowser(media.getFilePageTitle().getMobileUri().toString()); } } private void enableDeleteButton(boolean visibility) { delete.setEnabled(visibility); - if(visibility) { + if (visibility) { delete.setTextColor(getResources().getColor(R.color.primaryTextColor)); } else { delete.setTextColor(getResources().getColor(R.color.deleteButtonLight)); diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java index 23d3f2466..824e5f4df 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java @@ -99,7 +99,7 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple pager.setAdapter(adapter); pager.setCurrentItem(pageNumber, false); - if(getActivity() == null) { + if (getActivity() == null) { Timber.d("Returning as activity is destroyed!"); return; } @@ -133,7 +133,7 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple @Override public boolean onOptionsItemSelected(MenuItem item) { - if(getActivity() == null) { + if (getActivity() == null) { Timber.d("Returning as activity is destroyed!"); return true; } @@ -156,7 +156,7 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple viewIntent.setAction(ACTION_VIEW); viewIntent.setData(m.getFilePageTitle().getMobileUri()); //check if web browser available - if(viewIntent.resolveActivity(getActivity().getPackageManager()) != null){ + if (viewIntent.resolveActivity(getActivity().getPackageManager()) != null){ startActivity(viewIntent); } else { Toast toast = Toast.makeText(getContext(), getString(R.string.no_web_browser), LENGTH_SHORT); @@ -193,7 +193,7 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple * @param media */ private void setWallpaper(Media media) { - if(media.getImageUrl() == null || media.getImageUrl().isEmpty()) { + if (media.getImageUrl() == null || media.getImageUrl().isEmpty()) { Timber.d("Media URL not present"); return; } @@ -255,7 +255,7 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple inflater.inflate(R.menu.fragment_image_detail, menu); if (pager != null) { MediaDetailProvider provider = (MediaDetailProvider) getActivity(); - if(provider == null) { + if (provider == null) { return; } @@ -326,7 +326,7 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple @Override public void onPageScrolled(int i, float v, int i2) { - if(getActivity() == null) { + if (getActivity() == null) { Timber.d("Returning as activity is destroyed!"); return; } @@ -381,7 +381,7 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple public Fragment getItem(int i) { if (i == 0) { // See bug https://code.google.com/p/android/issues/detail?id=27526 - if(getActivity() == null) { + if (getActivity() == null) { Timber.d("Skipping getItem. Returning as activity is destroyed!"); return null; } @@ -392,11 +392,11 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple @Override public int getCount() { - if(getActivity() == null) { + if (getActivity() == null) { Timber.d("Skipping getCount. Returning as activity is destroyed!"); return 0; } return ((MediaDetailProvider) getActivity()).getTotalMediaCount(); } } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java b/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java index eeb343da7..2e1cbb1ac 100644 --- a/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java +++ b/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java @@ -244,9 +244,9 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi { Timber.d("Central auth token isn't valid. Trying to fetch a fresh token"); api.removeAllCookies(); String loginResultCode = login(AccountUtil.getUserName(context), AccountUtil.getPassword(context)); - if(loginResultCode.equals("PASS")) { + if (loginResultCode.equals("PASS")) { return getCentralAuthToken(); - } else if(loginResultCode.equals("2FA")) { + } else if (loginResultCode.equals("2FA")) { Timber.e("Cannot refresh session for 2FA enabled user. Login required"); } else { Timber.e("Error occurred in refreshing session. Error code is %s", loginResultCode); diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/CustomApiResult.java b/app/src/main/java/fr/free/nrw/commons/mwapi/CustomApiResult.java index a36e8e0fd..9eb96a164 100644 --- a/app/src/main/java/fr/free/nrw/commons/mwapi/CustomApiResult.java +++ b/app/src/main/java/fr/free/nrw/commons/mwapi/CustomApiResult.java @@ -117,4 +117,4 @@ public class CustomApiResult { return null; } } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/CustomMwApi.java b/app/src/main/java/fr/free/nrw/commons/mwapi/CustomMwApi.java index 61fc7cf71..fa7ffb8e7 100644 --- a/app/src/main/java/fr/free/nrw/commons/mwapi/CustomMwApi.java +++ b/app/src/main/java/fr/free/nrw/commons/mwapi/CustomMwApi.java @@ -58,7 +58,7 @@ public class CustomMwApi { } public String getAuthCookie() { - if(authCookie == null){ + if (authCookie == null){ authCookie = ""; List cookies = client.getCookieStore().getCookies(); for(Cookie cookie: cookies) { @@ -102,14 +102,14 @@ public class CustomMwApi { } public String getUserID() throws IOException { - if(this.userID == null || this.userID.equals("0")) { + if (this.userID == null || this.userID.equals("0")) { this.validateLogin(); } return userID; } public String getUserName() throws IOException { - if(this.userID == null || this.userID.equals("0")) { + if (this.userID == null || this.userID.equals("0")) { this.validateLogin(); } return userName; @@ -122,7 +122,7 @@ public class CustomMwApi { String token = tokenData.getString("/api/login/@token"); CustomApiResult confirmData = this.action("login").param("lgname", username).param("lgpassword", password).param("lgtoken", token).post(); String finalResult = confirmData.getString("/api/login/@result"); - if(finalResult.equals("Success")) { + if (finalResult.equals("Success")) { isLoggedIn = true; } return finalResult; @@ -149,7 +149,7 @@ public class CustomMwApi { .data("comment", comment) .data("filename", filename) .sendProgressListener(uploadProgressListener); - if(length != -1) { + if (length != -1) { builder.file("file", filename, file, length); } else { builder.file("file", filename, file); @@ -177,4 +177,4 @@ public class CustomMwApi { return CustomApiResult.fromRequestBuilder(builder, client); } } -; \ No newline at end of file +; diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java index b80e6e2a3..ca4d7adef 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java @@ -196,10 +196,10 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp // Handle item selection switch (item.getItemId()) { case R.id.action_display_list: - if(bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_COLLAPSED || bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_HIDDEN){ + if (bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_COLLAPSED || bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_HIDDEN){ bottomSheetBehaviorForDetails.setState(BottomSheetBehavior.STATE_HIDDEN); bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED); - }else if(bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_EXPANDED){ + }else if (bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_EXPANDED){ bottomSheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED); } @@ -356,7 +356,7 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp super.onPause(); // this means that this activity will not be recreated now, user is leaving it // or the activity is otherwise finishing - if(isFinishing()) { + if (isFinishing()) { // we will not need this fragment anymore, this may also be a good place to signal // to the retained fragment object to perform its own cleanup. removeMapFragment(); diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapterFactory.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapterFactory.java index 3adc8e529..628ed1add 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapterFactory.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapterFactory.java @@ -45,4 +45,4 @@ public class NearbyAdapterFactory { rendererAdapter.notifyDataSetChanged(); rendererAdapter.diffUpdate(newPlaceList); } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java index 5f0a1ebe2..b094cbb41 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java @@ -164,4 +164,4 @@ public class NearbyListFragment extends DaggerFragment { this.bundleForUpdates = bundleForUpdates; } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java index d73cdf6d5..69a05a339 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java @@ -281,7 +281,7 @@ public class NearbyMapFragment extends DaggerFragment { // Make camera to follow user on location change CameraPosition position ; - if(ViewUtil.isPortrait(getActivity())){ + if (ViewUtil.isPortrait(getActivity())){ position = new CameraPosition.Builder() .target(isBottomListSheetExpanded ? new LatLng(curMapBoxLatLng.getLatitude()- CAMERA_TARGET_SHIFT_FACTOR_PORTRAIT, @@ -315,7 +315,7 @@ public class NearbyMapFragment extends DaggerFragment { if (mapboxMap != null && curLatLng != null) { if (isBottomListSheetExpanded) { // Make camera to follow user on location change - if(ViewUtil.isPortrait(getActivity())) { + if (ViewUtil.isPortrait(getActivity())) { position = new CameraPosition.Builder() .target(new LatLng(curLatLng.getLatitude() - CAMERA_TARGET_SHIFT_FACTOR_PORTRAIT, curLatLng.getLongitude())) // Sets the new camera target above @@ -416,7 +416,7 @@ public class NearbyMapFragment extends DaggerFragment { mapView.getMapAsync(mapboxMap -> { CameraPosition position; - if(ViewUtil.isPortrait(getActivity())){ + if (ViewUtil.isPortrait(getActivity())){ position = new CameraPosition.Builder() .target(isBottomListSheetExpanded ? new LatLng(curLatLng.getLatitude()- CAMERA_TARGET_SHIFT_FACTOR_PORTRAIT, diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/Sitelinks.java b/app/src/main/java/fr/free/nrw/commons/nearby/Sitelinks.java index 8993db344..f4925af0e 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/Sitelinks.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/Sitelinks.java @@ -100,4 +100,4 @@ public class Sitelinks implements Parcelable { return new Sitelinks(this); } } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java index baaad04f5..5af23c340 100644 --- a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java @@ -85,7 +85,7 @@ public class NotificationActivity extends NavigationBaseActivity { private void addNotifications() { Timber.d("Add notifications"); - if(mNotificationWorkerFragment == null){ + if (mNotificationWorkerFragment == null){ Observable.fromCallable(() -> { progressBar.setVisibility(View.VISIBLE); return controller.getNotifications(); @@ -115,7 +115,7 @@ public class NotificationActivity extends NavigationBaseActivity { } private void setAdapter(List notificationList) { - if(notificationList == null || notificationList.isEmpty()) { + if (notificationList == null || notificationList.isEmpty()) { ViewUtil.showSnackbar(relativeLayout, R.string.no_notifications); return; } diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationType.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationType.java index b83b23b2a..0386ead95 100644 --- a/app/src/main/java/fr/free/nrw/commons/notification/NotificationType.java +++ b/app/src/main/java/fr/free/nrw/commons/notification/NotificationType.java @@ -24,4 +24,4 @@ public enum NotificationType { } return UNKNOWN; } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationUtils.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationUtils.java index e7c87d3f4..095a8a666 100644 --- a/app/src/main/java/fr/free/nrw/commons/notification/NotificationUtils.java +++ b/app/src/main/java/fr/free/nrw/commons/notification/NotificationUtils.java @@ -193,7 +193,7 @@ public class NotificationUtils { private static String getNotificationIconUrl(Node document) { String format = "%s%s"; Node iconUrl = getNode(getModel(document), "iconUrl"); - if(iconUrl == null) { + if (iconUrl == null) { return null; } else { String url = iconUrl.getTextContent(); diff --git a/app/src/main/java/fr/free/nrw/commons/quiz/QuizActivity.java b/app/src/main/java/fr/free/nrw/commons/quiz/QuizActivity.java index 10b808b1f..92075864e 100644 --- a/app/src/main/java/fr/free/nrw/commons/quiz/QuizActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/quiz/QuizActivity.java @@ -51,7 +51,7 @@ public class QuizActivity extends AppCompatActivity { */ @OnClick(R.id.next_button) public void setNextQuestion(){ - if( questionIndex <= quiz.size() && (positiveAnswer.isChecked() || negativeAnswer.isChecked())) { + if ( questionIndex <= quiz.size() && (positiveAnswer.isChecked() || negativeAnswer.isChecked())) { evaluateScore(); } else if ( !positiveAnswer.isChecked() && !negativeAnswer.isChecked()){ AlertDialog.Builder alert = new AlertDialog.Builder(this); @@ -107,11 +107,11 @@ public class QuizActivity extends AppCompatActivity { * to evaluate score and check whether answer is correct or wrong */ public void evaluateScore() { - if((quiz.get(questionIndex).isAnswer() && positiveAnswer.isChecked()) || + if ((quiz.get(questionIndex).isAnswer() && positiveAnswer.isChecked()) || (!quiz.get(questionIndex).isAnswer() && negativeAnswer.isChecked()) ){ customAlert(getResources().getString(R.string.correct),quiz.get(questionIndex).getAnswerMessage() ); score++; - } else{ + } else { customAlert(getResources().getString(R.string.wrong), quiz.get(questionIndex).getAnswerMessage()); } } @@ -127,12 +127,12 @@ public class QuizActivity extends AppCompatActivity { alert.setMessage(Message); alert.setPositiveButton(R.string.continue_message, (dialog, which) -> { questionIndex++; - if(questionIndex == quiz.size()){ + if (questionIndex == quiz.size()) { Intent i = new Intent(QuizActivity.this, QuizResultActivity.class); dialog.dismiss(); i.putExtra("QuizResult",score); startActivity(i); - }else { + } else { displayQuestion(); } }); diff --git a/app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.java b/app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.java index 654c08fa9..7ae2cbe79 100644 --- a/app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.java +++ b/app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.java @@ -73,7 +73,7 @@ public class QuizChecker { */ private void setTotalUploadCount(int uploadCount) { totalUploadCount = uploadCount - countPref.getInt(UPLOAD_SHARED_PREFERENCE,0); - if( totalUploadCount < 0){ + if ( totalUploadCount < 0){ totalUploadCount = 0; countPref.edit().putInt(UPLOAD_SHARED_PREFERENCE,0).apply(); } @@ -104,7 +104,7 @@ public class QuizChecker { */ private void setRevertParameter(int revertCountFetched) { revertCount = revertCountFetched - revertPref.getInt(REVERT_SHARED_PREFERENCE,0); - if(revertCount < 0){ + if (revertCount < 0){ revertCount = 0; revertPref.edit().putInt(REVERT_SHARED_PREFERENCE, 0).apply(); } @@ -116,7 +116,7 @@ public class QuizChecker { * to check whether the criterion to call quiz is satisfied */ private void calculateRevertParameter() { - if( revertCount < 0 || totalUploadCount < 0){ + if ( revertCount < 0 || totalUploadCount < 0){ revertPref.edit().putInt(REVERT_SHARED_PREFERENCE, 0).apply(); countPref.edit().putInt(UPLOAD_SHARED_PREFERENCE,0).apply(); return; diff --git a/app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.java b/app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.java index c5e138b07..18441146e 100644 --- a/app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.java @@ -57,7 +57,7 @@ public class QuizResultActivity extends AppCompatActivity { ButterKnife.bind(this); setSupportActionBar(toolbar); - if( getIntent() != null) { + if ( getIntent() != null) { Bundle extras = getIntent().getExtras(); int score = extras.getInt("QuizResult"); setScore(score); diff --git a/app/src/main/java/fr/free/nrw/commons/quiz/RadioGroupHelper.java b/app/src/main/java/fr/free/nrw/commons/quiz/RadioGroupHelper.java index 5de64a62b..79756871d 100644 --- a/app/src/main/java/fr/free/nrw/commons/quiz/RadioGroupHelper.java +++ b/app/src/main/java/fr/free/nrw/commons/quiz/RadioGroupHelper.java @@ -58,7 +58,7 @@ public class RadioGroupHelper { */ View.OnClickListener onClickListener = v -> { for (CompoundButton rb : radioButtons) { - if(rb != v) rb.setChecked(false); + if (rb != v) rb.setChecked(false); } }; -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java b/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java index 54b462097..ecfbe14e0 100644 --- a/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java @@ -67,4 +67,4 @@ public class SettingsActivity extends NavigationBaseActivity { return super.onOptionsItemSelected(item); } } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/ui/widget/CompatTextView.java b/app/src/main/java/fr/free/nrw/commons/ui/widget/CompatTextView.java index abe2e2554..22ae33ec6 100644 --- a/app/src/main/java/fr/free/nrw/commons/ui/widget/CompatTextView.java +++ b/app/src/main/java/fr/free/nrw/commons/ui/widget/CompatTextView.java @@ -97,4 +97,4 @@ public class CompatTextView extends AppCompatTextView { a.recycle(); } } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/ui/widget/HtmlTextView.java b/app/src/main/java/fr/free/nrw/commons/ui/widget/HtmlTextView.java index 4e73776c1..2f6f08105 100644 --- a/app/src/main/java/fr/free/nrw/commons/ui/widget/HtmlTextView.java +++ b/app/src/main/java/fr/free/nrw/commons/ui/widget/HtmlTextView.java @@ -48,4 +48,4 @@ public class HtmlTextView extends AppCompatTextView { return Html.fromHtml(source); } } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java b/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java index f74c40867..7d59a7568 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java @@ -92,4 +92,4 @@ public class ExistingFileAsync extends AsyncTask { callback.onResult(Result.NO_DUPLICATE); } } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/upload/FileUtils.java b/app/src/main/java/fr/free/nrw/commons/upload/FileUtils.java index 0cd45c189..2536909b0 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/FileUtils.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/FileUtils.java @@ -166,7 +166,7 @@ public class FileUtils { returnPath = uri.getPath(); } - if(returnPath == null) { + if (returnPath == null) { //fetching path may fail depending on the source URI and all hope is lost //so we will create and use a copy of the file, which seems to work String copyPath = null; @@ -377,4 +377,4 @@ public class FileUtils { } } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java index 1349ed773..703e26657 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java @@ -256,7 +256,7 @@ public class MultipleShareActivity extends AuthenticatedActivity public void onPositiveButtonClicked() { //If the user is willing to give us the permission //But had somehow previously choose never ask again, we take him to app settings to manually enable permission - if(null== permissionDeniedResponse){ + if (null== permissionDeniedResponse){ //Dexter returned null, lets see if this ever happens return; } @@ -490,4 +490,4 @@ public class MultipleShareActivity extends AuthenticatedActivity } super.onStop(); } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java index 6757c8419..9da820a7e 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java @@ -662,7 +662,7 @@ public class ShareActivity public boolean onKeyDown(int keyCode, KeyEvent event) { switch (keyCode) { case KeyEvent.KEYCODE_BACK: - if(isZoom) { + if (isZoom) { onZoomOutFabClicked(); return true; } diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java index 222757f54..ce69110cc 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java @@ -112,7 +112,7 @@ public class UploadController { Timber.d("Wikidata entity ID received from Share activity is %s", wikiDataEntityId); //TODO: Modify this to include coords Account currentAccount = sessionManager.getCurrentAccount(); - if(currentAccount == null) { + if (currentAccount == null) { Timber.d("Current account is null"); ViewUtil.showLongToast(context, context.getString(R.string.user_not_logged_in)); sessionManager.forceLogin(context); diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java index 488517121..2eae7b8f5 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java @@ -230,7 +230,7 @@ public class UploadService extends HandlerService { //As the fileInputStream is null there's no point in continuing the upload process //mwapi.upload accepts a NonNull input stream - if(fileInputStream == null) { + if (fileInputStream == null) { Timber.d("File not found"); return; } diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UrlLicense.java b/app/src/main/java/fr/free/nrw/commons/upload/UrlLicense.java index d3274bf2c..53aaaa106 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UrlLicense.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UrlLicense.java @@ -62,7 +62,7 @@ public class UrlLicense { urlLicense.put("zh","https://commons.wikimedia.org/wiki/Commons:Licensing/zh"); } public String getLicenseUrl ( String language){ - if(urlLicense.containsKey(language)) { + if (urlLicense.containsKey(language)) { return urlLicense.get(language); } else { return urlLicense.get("en"); diff --git a/app/src/main/java/fr/free/nrw/commons/utils/FileUtils.java b/app/src/main/java/fr/free/nrw/commons/utils/FileUtils.java index d8e569564..26ab5b2ca 100644 --- a/app/src/main/java/fr/free/nrw/commons/utils/FileUtils.java +++ b/app/src/main/java/fr/free/nrw/commons/utils/FileUtils.java @@ -66,7 +66,7 @@ public class FileUtils { */ public static boolean checkIfDirectoryExists(String pathToCheck) { File director = new File(pathToCheck); - if(director.exists() && director.isDirectory()) { + if (director.exists() && director.isDirectory()) { return true; } else { return false; diff --git a/app/src/main/java/fr/free/nrw/commons/utils/StringSortingUtils.java b/app/src/main/java/fr/free/nrw/commons/utils/StringSortingUtils.java index e409b856d..1b321ec07 100644 --- a/app/src/main/java/fr/free/nrw/commons/utils/StringSortingUtils.java +++ b/app/src/main/java/fr/free/nrw/commons/utils/StringSortingUtils.java @@ -44,4 +44,4 @@ public class StringSortingUtils { double distanceBetweenStrings = new Levenshtein().distance(longer, shorter); return (longerLength - distanceBetweenStrings) / (double) longerLength; } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/utils/UriDeserializer.java b/app/src/main/java/fr/free/nrw/commons/utils/UriDeserializer.java index ad37b27fc..9be11d295 100644 --- a/app/src/main/java/fr/free/nrw/commons/utils/UriDeserializer.java +++ b/app/src/main/java/fr/free/nrw/commons/utils/UriDeserializer.java @@ -15,4 +15,4 @@ public class UriDeserializer implements JsonDeserializer { final JsonDeserializationContext context) throws JsonParseException { return Uri.parse(src.getAsString()); } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java b/app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java index af71e826d..ed6513ca2 100644 --- a/app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java +++ b/app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java @@ -15,7 +15,7 @@ public class ViewUtil { public static final String SHOWCASE_VIEW_ID_3 = "SHOWCASE_VIEW_ID_3"; public static void showSnackbar(View view, int messageResourceId) { - if(view.getContext() == null) { + if (view.getContext() == null) { return; } @@ -32,7 +32,7 @@ public class ViewUtil { public static boolean isPortrait(Context context) { Display orientation = ((Activity)context).getWindowManager().getDefaultDisplay(); - if(orientation.getWidth() < orientation.getHeight()){ + if (orientation.getWidth() < orientation.getHeight()){ return true; } else { return false; diff --git a/app/src/main/java/fr/free/nrw/commons/widget/PicOfDayAppWidget.java b/app/src/main/java/fr/free/nrw/commons/widget/PicOfDayAppWidget.java index 22bea67b3..fc87f7abb 100644 --- a/app/src/main/java/fr/free/nrw/commons/widget/PicOfDayAppWidget.java +++ b/app/src/main/java/fr/free/nrw/commons/widget/PicOfDayAppWidget.java @@ -128,4 +128,4 @@ public class PicOfDayAppWidget extends AppWidgetProvider { public void onDisabled(Context context) { // Enter relevant functionality for when the last widget is disabled } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditListenerImpl.java b/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditListenerImpl.java index 407c24711..a97d0eded 100644 --- a/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditListenerImpl.java +++ b/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditListenerImpl.java @@ -17,4 +17,4 @@ public class WikidataEditListenerImpl extends WikidataEditListener { wikidataP18EditListener.onWikidataEditSuccessful(); } } -} \ No newline at end of file +} diff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java b/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java index 0a7c0b8ec..6b0c52cb3 100644 --- a/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java +++ b/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java @@ -48,12 +48,12 @@ public class WikidataEditService { * @param fileName */ public void createClaimWithLogging(String wikidataEntityId, String fileName) { - if(wikidataEntityId == null) { + if (wikidataEntityId == null) { Timber.d("Skipping creation of claim as Wikidata entity ID is null"); return; } - if(fileName == null) { + if (fileName == null) { Timber.d("Skipping creation of claim as fileName entity ID is null"); return; }