From 01a752647799482075aa33ab1a53d7c3a8258ae6 Mon Sep 17 00:00:00 2001 From: Ronak Lakhotia Date: Fri, 22 Feb 2019 17:21:58 +0800 Subject: [PATCH] Fix code quality issues (#2359) * Minor changes * Fix more errors * Revert change * Minor error fix * Remove unused import * Merge branch 'master' of github.com:commons-app/apps-android-commons into lint-errors # Conflicts: # app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java * Minor changes * Undo changes * Undo performclick --- .../main/java/fr/free/nrw/commons/auth/LoginActivity.java | 6 +++--- .../java/fr/free/nrw/commons/campaigns/CampaignView.java | 1 + .../fr/free/nrw/commons/campaigns/CampaignsPresenter.java | 1 + .../main/java/fr/free/nrw/commons/delete/DeleteTask.java | 8 ++++---- app/src/main/res/layout/activity_achievements.xml | 2 +- app/src/main/res/layout/activity_quiz_result.xml | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) 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 79a659ee2..e63650d0e 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 @@ -29,6 +29,7 @@ import android.widget.TextView; import java.io.IOException; import java.util.Locale; +import java.util.Objects; import javax.inject.Inject; import javax.inject.Named; @@ -62,7 +63,6 @@ import static fr.free.nrw.commons.auth.AccountUtil.AUTH_TOKEN_TYPE; public class LoginActivity extends AccountAuthenticatorActivity { - public static final String PARAM_USERNAME = "fr.free.nrw.commons.login.username"; private static final String FEATURED_IMAGES_CATEGORY = "Category:Featured_pictures_on_Wikimedia_Commons"; @Inject MediaWikiApi mwApi; @@ -387,10 +387,10 @@ public class LoginActivity extends AccountAuthenticatorActivity { super.onRestoreInstanceState(savedInstanceState); loginCurrentlyInProgress = savedInstanceState.getBoolean(LOGGING_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); } diff --git a/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignView.java b/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignView.java index c93ef6f7e..03e7c8814 100644 --- a/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignView.java +++ b/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignView.java @@ -12,6 +12,7 @@ import android.widget.TextView; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.Locale; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignsPresenter.java b/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignsPresenter.java index f1ec6321c..10b3d98fd 100644 --- a/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignsPresenter.java +++ b/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignsPresenter.java @@ -9,6 +9,7 @@ import java.text.SimpleDateFormat; import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.Locale; import javax.inject.Inject; import javax.inject.Singleton; 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 81a1e0aba..ff08c7cd1 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 @@ -30,7 +30,7 @@ public class DeleteTask extends AsyncTask { @Inject MediaWikiApi mwApi; @Inject SessionManager sessionManager; - public static final int NOTIFICATION_DELETE = 1; + private static final int NOTIFICATION_DELETE = 1; private NotificationManager notificationManager; private Builder notificationBuilder; @@ -113,11 +113,11 @@ public class DeleteTask extends AsyncTask { publishProgress(4); mwApi.appendEdit(editToken,userPageString+"\n", - "User_Talk:"+sessionManager.getCurrentAccount().name,summary); + "User_Talk:"+ sessionManager.getCurrentAccount().name,summary); publishProgress(5); } catch (Exception e) { - Timber.d(e.getMessage()); + Timber.e(e); return false; } return true; @@ -160,7 +160,7 @@ public class DeleteTask extends AsyncTask { @Override protected void onPostExecute(Boolean result) { - String message = ""; + String message; String title = "Nominating for Deletion"; if (result){ diff --git a/app/src/main/res/layout/activity_achievements.xml b/app/src/main/res/layout/activity_achievements.xml index 0fb725cc5..3b8c2862b 100644 --- a/app/src/main/res/layout/activity_achievements.xml +++ b/app/src/main/res/layout/activity_achievements.xml @@ -149,7 +149,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/achievements_revert_limit_message" - android:textSize="10dp" + android:textSize="10sp" android:id="@+id/images_revert_limit_text" android:layout_marginLeft="@dimen/activity_margin_horizontal" android:layout_marginStart="@dimen/activity_margin_horizontal" diff --git a/app/src/main/res/layout/activity_quiz_result.xml b/app/src/main/res/layout/activity_quiz_result.xml index b1f941ff2..0e463832f 100644 --- a/app/src/main/res/layout/activity_quiz_result.xml +++ b/app/src/main/res/layout/activity_quiz_result.xml @@ -44,7 +44,7 @@ android:layout_gravity="center_horizontal" android:text="@string/result" style="?android:textAppearanceLarge" - android:textSize="32dp" + android:textSize="32sp" android:layout_marginTop="@dimen/activity_margin_vertical" />