From e2c9c1cd6951b4124d7555be3620ba57c7f1d953 Mon Sep 17 00:00:00 2001 From: Paul Oranje Date: Fri, 26 Oct 2018 15:51:29 +0200 Subject: [PATCH 1/2] inserted missi^C spaces between if and ( --- .../free/nrw/commons/upload/FileUtilsTest.java | 2 +- .../main/java/fr/free/nrw/commons/Utils.java | 2 +- .../fr/free/nrw/commons/WelcomeActivity.java | 4 ++-- .../free/nrw/commons/WelcomePagerAdapter.java | 6 +++--- .../achievements/AchievementsActivity.java | 6 +++--- .../nrw/commons/achievements/BitmapUtils.java | 2 +- .../commons/achievements/FeaturedImages.java | 2 +- .../commons/achievements/FeedbackResponse.java | 2 +- .../free/nrw/commons/auth/LoginActivity.java | 8 ++++---- .../bookmarks/BookmarksPagerAdapter.java | 2 +- .../pictures/BookmarkPicturesFragment.java | 6 +++--- .../fr/free/nrw/commons/category/Category.java | 2 +- .../category/CategoryImageController.java | 2 +- .../category/CategoryImagesListFragment.java | 8 ++++---- .../nrw/commons/category/GridViewAdapter.java | 2 +- .../category/SubCategoryListFragment.java | 6 +++--- .../commons/concurrency/ThreadPoolService.java | 2 +- .../contributions/ContributionsActivity.java | 6 +++--- .../ContributionsListFragment.java | 2 +- .../fr/free/nrw/commons/delete/DeleteTask.java | 2 +- .../commons/di/ApplicationlessInjection.java | 2 +- .../commons/di/CommonsApplicationModule.java | 2 +- .../di/CommonsDaggerAppCompatActivity.java | 2 +- .../di/CommonsDaggerBroadcastReceiver.java | 2 +- .../di/CommonsDaggerContentProvider.java | 2 +- .../commons/di/CommonsDaggerIntentService.java | 2 +- .../nrw/commons/di/CommonsDaggerService.java | 2 +- .../di/CommonsDaggerSupportFragment.java | 2 +- .../categories/SearchCategoryFragment.java | 6 +++--- .../explore/images/SearchImageFragment.java | 6 +++--- .../explore/recentsearches/RecentSearch.java | 2 +- .../nrw/commons/logging/CommonsLogSender.java | 2 +- .../nrw/commons/logging/FileLoggingTree.java | 2 +- .../commons/logging/LogLevelSettableTree.java | 2 +- .../fr/free/nrw/commons/logging/LogUtils.java | 4 ++-- .../free/nrw/commons/logging/LogsSender.java | 2 +- .../nrw/commons/media/MediaDetailFragment.java | 10 +++++----- .../media/MediaDetailPagerFragment.java | 18 +++++++++--------- .../mwapi/ApacheHttpClientMediaWikiApi.java | 4 ++-- .../nrw/commons/mwapi/CustomApiResult.java | 2 +- .../fr/free/nrw/commons/mwapi/CustomMwApi.java | 12 ++++++------ .../nrw/commons/nearby/NearbyActivity.java | 6 +++--- .../commons/nearby/NearbyAdapterFactory.java | 2 +- .../nrw/commons/nearby/NearbyListFragment.java | 2 +- .../nrw/commons/nearby/NearbyMapFragment.java | 6 +++--- .../fr/free/nrw/commons/nearby/Sitelinks.java | 2 +- .../notification/NotificationActivity.java | 4 ++-- .../commons/notification/NotificationType.java | 2 +- .../notification/NotificationUtils.java | 2 +- .../fr/free/nrw/commons/quiz/QuizActivity.java | 6 +++--- .../fr/free/nrw/commons/quiz/QuizChecker.java | 6 +++--- .../nrw/commons/quiz/QuizResultActivity.java | 2 +- .../nrw/commons/quiz/RadioGroupHelper.java | 4 ++-- .../nrw/commons/settings/SettingsActivity.java | 2 +- .../nrw/commons/ui/widget/CompatTextView.java | 2 +- .../nrw/commons/ui/widget/HtmlTextView.java | 2 +- .../nrw/commons/upload/ExistingFileAsync.java | 2 +- .../fr/free/nrw/commons/upload/FileUtils.java | 4 ++-- .../commons/upload/MultipleShareActivity.java | 4 ++-- .../free/nrw/commons/upload/ShareActivity.java | 2 +- .../nrw/commons/upload/UploadController.java | 2 +- .../free/nrw/commons/upload/UploadService.java | 2 +- .../fr/free/nrw/commons/upload/UrlLicense.java | 2 +- .../fr/free/nrw/commons/utils/FileUtils.java | 2 +- .../nrw/commons/utils/StringSortingUtils.java | 2 +- .../nrw/commons/utils/UriDeserializer.java | 2 +- .../fr/free/nrw/commons/utils/ViewUtil.java | 4 ++-- .../nrw/commons/widget/PicOfDayAppWidget.java | 2 +- .../wikidata/WikidataEditListenerImpl.java | 2 +- .../commons/wikidata/WikidataEditService.java | 4 ++-- 70 files changed, 124 insertions(+), 124 deletions(-) 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 d2db4614fe..636d30a1bf 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 void isNotSelfOwned() throws Exception { 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/Utils.java b/app/src/main/java/fr/free/nrw/commons/Utils.java index 1300287496..36c99017bc 100644 --- a/app/src/main/java/fr/free/nrw/commons/Utils.java +++ b/app/src/main/java/fr/free/nrw/commons/Utils.java @@ -78,7 +78,7 @@ public static String urlEncode(String url) { * @return string with capitalized first character */ public static String capitalize(String string) { - if(string.length() > 0) { + if (string.length() > 0) { return string.substring(0, 1).toUpperCase(Locale.getDefault()) + string.substring(1); } else { return string; 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 74247a02fa..109d115d44 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 void onCreate(Bundle savedInstanceState) { 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 void onCreate(Bundle savedInstanceState) { */ @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 8bc82be988..1e58205414 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 Object instantiateItem(ViewGroup container, int position) { 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 = (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 73143fb80f..66474a762c 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 @@ void shareScreen(Bitmap bitmap) { * 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 @@ private void onError() { * 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 @@ private void launchAlert(String title, String message){ */ 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 b7400117da..57318a12df 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 8b9992e285..a943ed4a39 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 int getQualityImages() { 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 37fea3e2dd..b8323f9738 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 String getUser() { 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 371f561cac..55c42a158d 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 void onCreate(Bundle savedInstanceState) { .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 @@ protected void onRestoreInstanceState(Bundle savedInstanceState) { 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 void askUserForTwoFactorAuth() { 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 cad65a87af..b0f94e3228 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 void requestPictureListUpdate() { 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 4232c1750c..90b3ef4574 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 void onResume() { */ @SuppressLint("CheckResult") private void initList() { - if(!NetworkUtils.isInternetConnectionEstablished(getContext())) { + if (!NetworkUtils.isInternetConnectionEstablished(getContext())) { handleNoInternet(); return; } @@ -179,7 +179,7 @@ private void initEmptyBookmarkListView() { * @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 @@ private void handleSuccess(List collection) { 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 f2d83d2e5f..8ea3c442c3 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 void setContentUri(Uri contentUri) { 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 3495d710ce..ae45952e46 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 CategoryImageController(MediaWikiApi mediaWikiApi) { 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 126895166b..6374e1a93c 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 @@ private void resetQueryContinueValues(String keyword) { */ @SuppressLint("CheckResult") private void initList() { - if(!NetworkUtils.isInternetConnectionEstablished(getContext())) { + if (!NetworkUtils.isInternetConnectionEstablished(getContext())) { handleNoInternet(); return; } @@ -208,7 +208,7 @@ public void fetchMoreImagesViewPager(){ */ @SuppressLint("CheckResult") private void fetchMoreImages() { - if(!NetworkUtils.isInternetConnectionEstablished(getContext())) { + if (!NetworkUtils.isInternetConnectionEstablished(getContext())) { handleNoInternet(); return; } @@ -227,13 +227,13 @@ private void fetchMoreImages() { * @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 ca4059e9d1..988e992fa2 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 @@ private void setAuthorView(Media item, TextView author) { 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 ed21d011b9..984d87fae4 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 View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle sav 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 View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle sav */ public void initSubCategoryList() { categoriesNotFoundView.setVisibility(GONE); - if(!NetworkUtils.isInternetConnectionEstablished(getContext())) { + if (!NetworkUtils.isInternetConnectionEstablished(getContext())) { handleNoInternet(); return; } @@ -118,7 +118,7 @@ public void initSubCategoryList() { * @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 e0fd495efc..2cda95a7d4 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 ThreadPoolService build() { 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 a903c63393..e01942d9f7 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 @@ protected void onCreate(Bundle savedInstanceState) { 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 void onLoadFinished(Loader cursorLoader, Cursor cursor) { ((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 a04c1120fe..a17db5e800 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 ListAdapter getAdapter() { 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 f35a6c38e2..81a1e0abaf 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 @@ protected void onPostExecute(Boolean result) { .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 2faf09b836..87a0d9da09 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 static ApplicationlessInjection getInstance(Context applicationContext) { 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 e6a61f3073..a52f6ddabb 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 WikidataEditListener provideWikidataEditListener() { 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 9f06725de9..9287e1bfc0 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 @@ private void inject() { 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 3c4cb9914f..10fa74a9b5 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 @@ private void inject(Context context) { 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 38506c4caa..06adee489d 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 @@ private void inject() { 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 995c517a14..41f661db45 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 @@ private void inject() { 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 dc6c10b9fd..0d045d2ceb 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 @@ private void inject() { 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 8c33e7a986..3f2556466e 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 @@ private HasSupportFragmentInjector findHasFragmentInjector() { 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 7f2b3ff930..520c55a572 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 @@ private void saveQuery(String query) { 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 void onScrollStateChanged(RecyclerView recyclerView, int newState) { 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 @@ private void handlePaginationSuccess(List mediaList) { */ 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 1b93abb7b9..b6006798ec 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 @@ private void saveQuery(String query) { 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{ @@ -126,7 +126,7 @@ public void onScrollStateChanged(RecyclerView recyclerView, int newState) { public void updateImageList(String query) { this.query = query; imagesNotFoundView.setVisibility(GONE); - if(!NetworkUtils.isInternetConnectionEstablished(getContext())) { + if (!NetworkUtils.isInternetConnectionEstablished(getContext())) { handleNoInternet(); return; } @@ -180,7 +180,7 @@ private void handlePaginationSuccess(List mediaList) { */ 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 ed1aa1d6be..ed6fb903a9 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 void setContentUri(Uri contentUri) { 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 407014db5f..7f4bb2ab7f 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 @@ protected String getExtraInfo() { 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 ce81743827..8630af4da5 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 @@ private void configureLogger(String logDir) { 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 83b8854ccc..5eeca6d3ed 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 @@ */ 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 21b133aa20..bdf07d3929 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 @@ private 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 16c40cf447..59ddb25237 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 @@ private void writeLogToZipFile(byte[] metaData, File zipFile) throws IOException 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 9a0932cad3..d814d202f3 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 @@ protected void onPreExecute() { @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 @@ private void setTextFields(Media media) { } 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 void onMediaDetailLicenceClicked(){ 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); @@ -418,14 +418,14 @@ public void onTextChanged(CharSequence s, int start, int before, int count) { @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 23d3f24668..824e5f4df8 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 View onCreateView(LayoutInflater inflater, 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 void onCreate(Bundle savedInstanceState) { @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 boolean onOptionsItemSelected(MenuItem item) { 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 boolean onOptionsItemSelected(MenuItem item) { * @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 void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { 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 void notifyDataSetChanged(){ @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 MediaDetailAdapter(FragmentManager fm) { 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 Fragment getItem(int i) { @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 eeb343da79..2e1cbb1ac3 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 String getCentralAuthToken() throws IOException { 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 a36e8e0fd8..9eb96a164e 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 String getString(String xpath) { 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 61fc7cf718..fa7ffb8e7c 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 RequestBuilder action(String action) { } public String getAuthCookie() { - if(authCookie == null){ + if (authCookie == null){ authCookie = ""; List cookies = client.getCookieStore().getCookies(); for(Cookie cookie: cookies) { @@ -102,14 +102,14 @@ public boolean validateLogin() throws IOException { } 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 String login(String username, String password) throws IOException { 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 CustomApiResult upload(String filename, InputStream file, long length, St .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 @@ private CustomApiResult makeRequest(String method, HashMap param 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 2143496f01..9c136616a1 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 @@ -195,10 +195,10 @@ public boolean onOptionsItemSelected(MenuItem item) { // 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); } @@ -355,7 +355,7 @@ public void onPause() { 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 3adc8e529c..628ed1add7 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 void updateAdapterData(List newPlaceList, RVRendererAdapter 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 5f0a1ebe2b..b094cbb411 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 void setBundleForUpdates(Bundle bundleForUpdates) { 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 129fe55f0b..af83b1f11c 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 @@ private void updateMapToTrackPosition() { // 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 @@ private void updateMapCameraAccordingToBottomSheet(boolean isBottomListSheetExpa 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 @@ private void setListeners() { 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 8993db3441..f4925af0e5 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 Sitelinks build() { 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 b366c944a0..97438606ae 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 @@ -87,7 +87,7 @@ private void refresh() { private void addNotifications() { Timber.d("Add notifications"); - if(mNotificationWorkerFragment == null){ + if (mNotificationWorkerFragment == null){ Observable.fromCallable(() -> { progressBar.setVisibility(View.VISIBLE); return controller.getNotifications(); @@ -117,7 +117,7 @@ private void handleUrl(String url) { } 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 b83b23b2a5..0386ead958 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 static NotificationType handledValueOf(String name) { } 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 e7c87d3f47..095a8a666b 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 @@ private static String getThankYouEditDescription(Node document) { 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 8624bbbefd..86a395ff37 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 @@ protected void onCreate(Bundle savedInstanceState) { */ @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); @@ -120,7 +120,7 @@ R.drawable.ic_error_outline_black_24dp, getTheme())) * 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++; @@ -142,7 +142,7 @@ public void customAlert(String title, String Message) { @Override public void onClick(DialogInterface dialog, int which) { questionIndex++; - if(questionIndex == quiz.size()){ + if (questionIndex == quiz.size()){ Intent i = new Intent(QuizActivity.this, QuizResultActivity.class); dialog.dismiss(); i.putExtra("QuizResult",score); 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 654c08fa96..7ae2cbe795 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 @@ private void setUploadCount() { */ 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 @@ private void setRevertCount() { */ 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 @@ private void setRevertParameter(int revertCountFetched) { * 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 00a4fd28b7..ca0c8dca1a 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 @@ protected void onCreate(Bundle savedInstanceState) { 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 9d907fc081..076602a372 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 @@ private void add(CompoundButton button){ */ 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 54b4620973..ecfbe14e09 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 boolean onOptionsItemSelected(MenuItem item) { 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 abe2e2554b..22ae33ec6d 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 @@ private void init(@Nullable AttributeSet attrs) { 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 4e73776c13..2f6f081055 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 @@ private static Spanned fromHtml(String source) { 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 f74c408678..7d59a75687 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 @@ protected void onPostExecute(Boolean fileExists) { 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 0cd45c1894..2536909b09 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 @@ else if ("file".equalsIgnoreCase(uri.getScheme())) { 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 static File createAndGetAppLogsFile(String logs) { } } -} \ 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 1349ed7737..703e266579 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 @@ R.drawable.ic_launcher, new Callback() { 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 @@ protected void onStop() { } 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 6757c84194..9da820a7e4 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 void onFabShowMapsClicked() { 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 222757f54b..ce69110cc5 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 void startUpload(String title, Uri contentProviderUri, Uri mediaUri, Stri 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 4885171212..2eae7b8f54 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 @@ private void uploadContribution(Contribution contribution) { //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 d3274bf2ce..53aaaa1064 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 void initialize(){ 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 1d1c6c9146..8e6ee7e515 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 @@ -62,7 +62,7 @@ public static Uri saveFileFromURI(Context context, Uri sourceUri, String destina */ 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 e409b856d5..1b321ec076 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 @@ private static double calculateSimilarity(String firstString, String secondStrin 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 ad37b27fc0..9be11d2955 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 Uri deserialize(final JsonElement src, final Type srcType, 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 af71e826dd..ed6513ca25 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 static void showLongToast(Context context, String text) { 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 770a9d2188..3cd3d0f35d 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 @@ -130,4 +130,4 @@ public void onEnabled(Context context) { 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 407c247116..a97d0ededf 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 void onSuccessfulWikidataEdit() { 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 d07bb56f3a..b31f52f73d 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 WikidataEditService(Context context, * @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; } From a3aa573310798c929cc35bb4c51ea6634e7427a8 Mon Sep 17 00:00:00 2001 From: Paul Oranje Date: Fri, 26 Oct 2018 15:51:29 +0200 Subject: [PATCH 2/2] inserted missing spaces between if and ( --- .../free/nrw/commons/upload/FileUtilsTest.java | 2 +- .../main/java/fr/free/nrw/commons/Utils.java | 2 +- .../fr/free/nrw/commons/WelcomeActivity.java | 4 ++-- .../free/nrw/commons/WelcomePagerAdapter.java | 6 +++--- .../achievements/AchievementsActivity.java | 6 +++--- .../nrw/commons/achievements/BitmapUtils.java | 2 +- .../commons/achievements/FeaturedImages.java | 2 +- .../commons/achievements/FeedbackResponse.java | 2 +- .../free/nrw/commons/auth/LoginActivity.java | 8 ++++---- .../bookmarks/BookmarksPagerAdapter.java | 2 +- .../pictures/BookmarkPicturesFragment.java | 6 +++--- .../fr/free/nrw/commons/category/Category.java | 2 +- .../category/CategoryImageController.java | 2 +- .../category/CategoryImagesListFragment.java | 8 ++++---- .../nrw/commons/category/GridViewAdapter.java | 2 +- .../category/SubCategoryListFragment.java | 6 +++--- .../commons/concurrency/ThreadPoolService.java | 2 +- .../contributions/ContributionsActivity.java | 6 +++--- .../ContributionsListFragment.java | 2 +- .../fr/free/nrw/commons/delete/DeleteTask.java | 2 +- .../commons/di/ApplicationlessInjection.java | 2 +- .../commons/di/CommonsApplicationModule.java | 2 +- .../di/CommonsDaggerAppCompatActivity.java | 2 +- .../di/CommonsDaggerBroadcastReceiver.java | 2 +- .../di/CommonsDaggerContentProvider.java | 2 +- .../commons/di/CommonsDaggerIntentService.java | 2 +- .../nrw/commons/di/CommonsDaggerService.java | 2 +- .../di/CommonsDaggerSupportFragment.java | 2 +- .../categories/SearchCategoryFragment.java | 6 +++--- .../explore/images/SearchImageFragment.java | 6 +++--- .../explore/recentsearches/RecentSearch.java | 2 +- .../nrw/commons/logging/CommonsLogSender.java | 2 +- .../nrw/commons/logging/FileLoggingTree.java | 2 +- .../commons/logging/LogLevelSettableTree.java | 2 +- .../fr/free/nrw/commons/logging/LogUtils.java | 4 ++-- .../free/nrw/commons/logging/LogsSender.java | 2 +- .../nrw/commons/media/MediaDetailFragment.java | 10 +++++----- .../media/MediaDetailPagerFragment.java | 18 +++++++++--------- .../mwapi/ApacheHttpClientMediaWikiApi.java | 4 ++-- .../nrw/commons/mwapi/CustomApiResult.java | 2 +- .../fr/free/nrw/commons/mwapi/CustomMwApi.java | 12 ++++++------ .../nrw/commons/nearby/NearbyActivity.java | 6 +++--- .../commons/nearby/NearbyAdapterFactory.java | 2 +- .../nrw/commons/nearby/NearbyListFragment.java | 2 +- .../nrw/commons/nearby/NearbyMapFragment.java | 6 +++--- .../fr/free/nrw/commons/nearby/Sitelinks.java | 2 +- .../notification/NotificationActivity.java | 4 ++-- .../commons/notification/NotificationType.java | 2 +- .../notification/NotificationUtils.java | 2 +- .../fr/free/nrw/commons/quiz/QuizActivity.java | 6 +++--- .../fr/free/nrw/commons/quiz/QuizChecker.java | 6 +++--- .../nrw/commons/quiz/QuizResultActivity.java | 2 +- .../nrw/commons/quiz/RadioGroupHelper.java | 4 ++-- .../nrw/commons/settings/SettingsActivity.java | 2 +- .../nrw/commons/ui/widget/CompatTextView.java | 2 +- .../nrw/commons/ui/widget/HtmlTextView.java | 2 +- .../nrw/commons/upload/ExistingFileAsync.java | 2 +- .../fr/free/nrw/commons/upload/FileUtils.java | 4 ++-- .../commons/upload/MultipleShareActivity.java | 4 ++-- .../free/nrw/commons/upload/ShareActivity.java | 2 +- .../nrw/commons/upload/UploadController.java | 2 +- .../free/nrw/commons/upload/UploadService.java | 2 +- .../fr/free/nrw/commons/upload/UrlLicense.java | 2 +- .../fr/free/nrw/commons/utils/FileUtils.java | 2 +- .../nrw/commons/utils/StringSortingUtils.java | 2 +- .../nrw/commons/utils/UriDeserializer.java | 2 +- .../fr/free/nrw/commons/utils/ViewUtil.java | 4 ++-- .../nrw/commons/widget/PicOfDayAppWidget.java | 2 +- .../wikidata/WikidataEditListenerImpl.java | 2 +- .../commons/wikidata/WikidataEditService.java | 4 ++-- 70 files changed, 124 insertions(+), 124 deletions(-) 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 d2db4614fe..636d30a1bf 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 void isNotSelfOwned() throws Exception { 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/Utils.java b/app/src/main/java/fr/free/nrw/commons/Utils.java index 1300287496..36c99017bc 100644 --- a/app/src/main/java/fr/free/nrw/commons/Utils.java +++ b/app/src/main/java/fr/free/nrw/commons/Utils.java @@ -78,7 +78,7 @@ public static String urlEncode(String url) { * @return string with capitalized first character */ public static String capitalize(String string) { - if(string.length() > 0) { + if (string.length() > 0) { return string.substring(0, 1).toUpperCase(Locale.getDefault()) + string.substring(1); } else { return string; 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 74247a02fa..109d115d44 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 void onCreate(Bundle savedInstanceState) { 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 void onCreate(Bundle savedInstanceState) { */ @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 8bc82be988..1e58205414 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 Object instantiateItem(ViewGroup container, int position) { 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 = (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 73143fb80f..66474a762c 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 @@ void shareScreen(Bitmap bitmap) { * 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 @@ private void onError() { * 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 @@ private void launchAlert(String title, String message){ */ 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 b7400117da..57318a12df 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 8b9992e285..a943ed4a39 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 int getQualityImages() { 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 37fea3e2dd..b8323f9738 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 String getUser() { 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 371f561cac..55c42a158d 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 void onCreate(Bundle savedInstanceState) { .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 @@ protected void onRestoreInstanceState(Bundle savedInstanceState) { 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 void askUserForTwoFactorAuth() { 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 cad65a87af..b0f94e3228 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 void requestPictureListUpdate() { 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 4232c1750c..90b3ef4574 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 void onResume() { */ @SuppressLint("CheckResult") private void initList() { - if(!NetworkUtils.isInternetConnectionEstablished(getContext())) { + if (!NetworkUtils.isInternetConnectionEstablished(getContext())) { handleNoInternet(); return; } @@ -179,7 +179,7 @@ private void initEmptyBookmarkListView() { * @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 @@ private void handleSuccess(List collection) { 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 f2d83d2e5f..8ea3c442c3 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 void setContentUri(Uri contentUri) { 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 3495d710ce..ae45952e46 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 CategoryImageController(MediaWikiApi mediaWikiApi) { 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 126895166b..6374e1a93c 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 @@ private void resetQueryContinueValues(String keyword) { */ @SuppressLint("CheckResult") private void initList() { - if(!NetworkUtils.isInternetConnectionEstablished(getContext())) { + if (!NetworkUtils.isInternetConnectionEstablished(getContext())) { handleNoInternet(); return; } @@ -208,7 +208,7 @@ public void fetchMoreImagesViewPager(){ */ @SuppressLint("CheckResult") private void fetchMoreImages() { - if(!NetworkUtils.isInternetConnectionEstablished(getContext())) { + if (!NetworkUtils.isInternetConnectionEstablished(getContext())) { handleNoInternet(); return; } @@ -227,13 +227,13 @@ private void fetchMoreImages() { * @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 ca4059e9d1..988e992fa2 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 @@ private void setAuthorView(Media item, TextView author) { 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 ed21d011b9..984d87fae4 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 View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle sav 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 View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle sav */ public void initSubCategoryList() { categoriesNotFoundView.setVisibility(GONE); - if(!NetworkUtils.isInternetConnectionEstablished(getContext())) { + if (!NetworkUtils.isInternetConnectionEstablished(getContext())) { handleNoInternet(); return; } @@ -118,7 +118,7 @@ public void initSubCategoryList() { * @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 e0fd495efc..2cda95a7d4 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 ThreadPoolService build() { 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 a903c63393..e01942d9f7 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 @@ protected void onCreate(Bundle savedInstanceState) { 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 void onLoadFinished(Loader cursorLoader, Cursor cursor) { ((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 a04c1120fe..a17db5e800 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 ListAdapter getAdapter() { 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 f35a6c38e2..81a1e0abaf 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 @@ protected void onPostExecute(Boolean result) { .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 2faf09b836..87a0d9da09 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 static ApplicationlessInjection getInstance(Context applicationContext) { 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 e6a61f3073..a52f6ddabb 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 WikidataEditListener provideWikidataEditListener() { 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 9f06725de9..9287e1bfc0 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 @@ private void inject() { 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 3c4cb9914f..10fa74a9b5 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 @@ private void inject(Context context) { 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 38506c4caa..06adee489d 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 @@ private void inject() { 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 995c517a14..41f661db45 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 @@ private void inject() { 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 dc6c10b9fd..0d045d2ceb 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 @@ private void inject() { 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 8c33e7a986..3f2556466e 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 @@ private HasSupportFragmentInjector findHasFragmentInjector() { 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 7f2b3ff930..520c55a572 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 @@ private void saveQuery(String query) { 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 void onScrollStateChanged(RecyclerView recyclerView, int newState) { 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 @@ private void handlePaginationSuccess(List mediaList) { */ 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 1b93abb7b9..b6006798ec 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 @@ private void saveQuery(String query) { 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{ @@ -126,7 +126,7 @@ public void onScrollStateChanged(RecyclerView recyclerView, int newState) { public void updateImageList(String query) { this.query = query; imagesNotFoundView.setVisibility(GONE); - if(!NetworkUtils.isInternetConnectionEstablished(getContext())) { + if (!NetworkUtils.isInternetConnectionEstablished(getContext())) { handleNoInternet(); return; } @@ -180,7 +180,7 @@ private void handlePaginationSuccess(List mediaList) { */ 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 ed1aa1d6be..ed6fb903a9 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 void setContentUri(Uri contentUri) { 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 407014db5f..7f4bb2ab7f 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 @@ protected String getExtraInfo() { 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 ce81743827..8630af4da5 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 @@ private void configureLogger(String logDir) { 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 83b8854ccc..5eeca6d3ed 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 @@ */ 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 21b133aa20..bdf07d3929 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 @@ private 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 16c40cf447..59ddb25237 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 @@ private void writeLogToZipFile(byte[] metaData, File zipFile) throws IOException 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 9a0932cad3..d814d202f3 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 @@ protected void onPreExecute() { @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 @@ private void setTextFields(Media media) { } 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 void onMediaDetailLicenceClicked(){ 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); @@ -418,14 +418,14 @@ public void onTextChanged(CharSequence s, int start, int before, int count) { @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 23d3f24668..824e5f4df8 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 View onCreateView(LayoutInflater inflater, 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 void onCreate(Bundle savedInstanceState) { @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 boolean onOptionsItemSelected(MenuItem item) { 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 boolean onOptionsItemSelected(MenuItem item) { * @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 void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { 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 void notifyDataSetChanged(){ @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 MediaDetailAdapter(FragmentManager fm) { 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 Fragment getItem(int i) { @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 eeb343da79..2e1cbb1ac3 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 String getCentralAuthToken() throws IOException { 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 a36e8e0fd8..9eb96a164e 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 String getString(String xpath) { 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 61fc7cf718..fa7ffb8e7c 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 RequestBuilder action(String action) { } public String getAuthCookie() { - if(authCookie == null){ + if (authCookie == null){ authCookie = ""; List cookies = client.getCookieStore().getCookies(); for(Cookie cookie: cookies) { @@ -102,14 +102,14 @@ public boolean validateLogin() throws IOException { } 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 String login(String username, String password) throws IOException { 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 CustomApiResult upload(String filename, InputStream file, long length, St .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 @@ private CustomApiResult makeRequest(String method, HashMap param 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 2143496f01..9c136616a1 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 @@ -195,10 +195,10 @@ public boolean onOptionsItemSelected(MenuItem item) { // 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); } @@ -355,7 +355,7 @@ public void onPause() { 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 3adc8e529c..628ed1add7 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 void updateAdapterData(List newPlaceList, RVRendererAdapter 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 5f0a1ebe2b..b094cbb411 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 void setBundleForUpdates(Bundle bundleForUpdates) { 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 129fe55f0b..af83b1f11c 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 @@ private void updateMapToTrackPosition() { // 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 @@ private void updateMapCameraAccordingToBottomSheet(boolean isBottomListSheetExpa 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 @@ private void setListeners() { 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 8993db3441..f4925af0e5 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 Sitelinks build() { 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 b366c944a0..97438606ae 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 @@ -87,7 +87,7 @@ private void refresh() { private void addNotifications() { Timber.d("Add notifications"); - if(mNotificationWorkerFragment == null){ + if (mNotificationWorkerFragment == null){ Observable.fromCallable(() -> { progressBar.setVisibility(View.VISIBLE); return controller.getNotifications(); @@ -117,7 +117,7 @@ private void handleUrl(String url) { } 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 b83b23b2a5..0386ead958 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 static NotificationType handledValueOf(String name) { } 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 e7c87d3f47..095a8a666b 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 @@ private static String getThankYouEditDescription(Node document) { 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 8624bbbefd..86a395ff37 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 @@ protected void onCreate(Bundle savedInstanceState) { */ @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); @@ -120,7 +120,7 @@ R.drawable.ic_error_outline_black_24dp, getTheme())) * 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++; @@ -142,7 +142,7 @@ public void customAlert(String title, String Message) { @Override public void onClick(DialogInterface dialog, int which) { questionIndex++; - if(questionIndex == quiz.size()){ + if (questionIndex == quiz.size()){ Intent i = new Intent(QuizActivity.this, QuizResultActivity.class); dialog.dismiss(); i.putExtra("QuizResult",score); 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 654c08fa96..7ae2cbe795 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 @@ private void setUploadCount() { */ 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 @@ private void setRevertCount() { */ 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 @@ private void setRevertParameter(int revertCountFetched) { * 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 00a4fd28b7..ca0c8dca1a 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 @@ protected void onCreate(Bundle savedInstanceState) { 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 9d907fc081..076602a372 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 @@ private void add(CompoundButton button){ */ 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 54b4620973..ecfbe14e09 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 boolean onOptionsItemSelected(MenuItem item) { 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 abe2e2554b..22ae33ec6d 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 @@ private void init(@Nullable AttributeSet attrs) { 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 4e73776c13..2f6f081055 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 @@ private static Spanned fromHtml(String source) { 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 f74c408678..7d59a75687 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 @@ protected void onPostExecute(Boolean fileExists) { 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 0cd45c1894..2536909b09 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 @@ else if ("file".equalsIgnoreCase(uri.getScheme())) { 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 static File createAndGetAppLogsFile(String logs) { } } -} \ 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 1349ed7737..703e266579 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 @@ R.drawable.ic_launcher, new Callback() { 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 @@ protected void onStop() { } 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 6757c84194..9da820a7e4 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 void onFabShowMapsClicked() { 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 222757f54b..ce69110cc5 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 void startUpload(String title, Uri contentProviderUri, Uri mediaUri, Stri 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 4885171212..2eae7b8f54 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 @@ private void uploadContribution(Contribution contribution) { //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 d3274bf2ce..53aaaa1064 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 void initialize(){ 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 1d1c6c9146..8e6ee7e515 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 @@ -62,7 +62,7 @@ public static Uri saveFileFromURI(Context context, Uri sourceUri, String destina */ 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 e409b856d5..1b321ec076 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 @@ private static double calculateSimilarity(String firstString, String secondStrin 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 ad37b27fc0..9be11d2955 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 Uri deserialize(final JsonElement src, final Type srcType, 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 af71e826dd..ed6513ca25 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 static void showLongToast(Context context, String text) { 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 770a9d2188..3cd3d0f35d 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 @@ -130,4 +130,4 @@ public void onEnabled(Context context) { 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 407c247116..a97d0ededf 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 void onSuccessfulWikidataEdit() { 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 d07bb56f3a..b31f52f73d 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 WikidataEditService(Context context, * @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; }