Skip to content

Commit 01a7526

Browse files
RonakLakhotiamaskaravivek
authored andcommitted
Fix code quality issues (commons-app#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
1 parent 9882d24 commit 01a7526

File tree

6 files changed

+11
-9
lines changed

6 files changed

+11
-9
lines changed

app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
import java.io.IOException;
3131
import java.util.Locale;
32+
import java.util.Objects;
3233

3334
import javax.inject.Inject;
3435
import javax.inject.Named;
@@ -62,7 +63,6 @@
6263

6364
public class LoginActivity extends AccountAuthenticatorActivity {
6465

65-
public static final String PARAM_USERNAME = "fr.free.nrw.commons.login.username";
6666
private static final String FEATURED_IMAGES_CATEGORY = "Category:Featured_pictures_on_Wikimedia_Commons";
6767

6868
@Inject MediaWikiApi mwApi;
@@ -387,10 +387,10 @@ protected void onRestoreInstanceState(Bundle savedInstanceState) {
387387
super.onRestoreInstanceState(savedInstanceState);
388388
loginCurrentlyInProgress = savedInstanceState.getBoolean(LOGGING_IN, false);
389389
errorMessageShown = savedInstanceState.getBoolean(ERROR_MESSAGE_SHOWN, false);
390-
if (loginCurrentlyInProgress){
390+
if (loginCurrentlyInProgress) {
391391
performLogin();
392392
}
393-
if (errorMessageShown){
393+
if (errorMessageShown) {
394394
resultantError = savedInstanceState.getString(RESULTANT_ERROR);
395395
handleOtherResults(resultantError);
396396
}

app/src/main/java/fr/free/nrw/commons/campaigns/CampaignView.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import java.text.ParseException;
1313
import java.text.SimpleDateFormat;
1414
import java.util.Date;
15+
import java.util.Locale;
1516

1617
import butterknife.BindView;
1718
import butterknife.ButterKnife;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.util.Collections;
1010
import java.util.Date;
1111
import java.util.List;
12+
import java.util.Locale;
1213

1314
import javax.inject.Inject;
1415
import javax.inject.Singleton;

app/src/main/java/fr/free/nrw/commons/delete/DeleteTask.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class DeleteTask extends AsyncTask<Void, Integer, Boolean> {
3030
@Inject MediaWikiApi mwApi;
3131
@Inject SessionManager sessionManager;
3232

33-
public static final int NOTIFICATION_DELETE = 1;
33+
private static final int NOTIFICATION_DELETE = 1;
3434

3535
private NotificationManager notificationManager;
3636
private Builder notificationBuilder;
@@ -113,11 +113,11 @@ protected Boolean doInBackground(Void ...voids) {
113113
publishProgress(4);
114114

115115
mwApi.appendEdit(editToken,userPageString+"\n",
116-
"User_Talk:"+sessionManager.getCurrentAccount().name,summary);
116+
"User_Talk:"+ sessionManager.getCurrentAccount().name,summary);
117117
publishProgress(5);
118118
}
119119
catch (Exception e) {
120-
Timber.d(e.getMessage());
120+
Timber.e(e);
121121
return false;
122122
}
123123
return true;
@@ -160,7 +160,7 @@ protected void onProgressUpdate (Integer... values){
160160

161161
@Override
162162
protected void onPostExecute(Boolean result) {
163-
String message = "";
163+
String message;
164164
String title = "Nominating for Deletion";
165165

166166
if (result){

app/src/main/res/layout/activity_achievements.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
android:layout_width="wrap_content"
150150
android:layout_height="wrap_content"
151151
android:text="@string/achievements_revert_limit_message"
152-
android:textSize="10dp"
152+
android:textSize="10sp"
153153
android:id="@+id/images_revert_limit_text"
154154
android:layout_marginLeft="@dimen/activity_margin_horizontal"
155155
android:layout_marginStart="@dimen/activity_margin_horizontal"

app/src/main/res/layout/activity_quiz_result.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
android:layout_gravity="center_horizontal"
4545
android:text="@string/result"
4646
style="?android:textAppearanceLarge"
47-
android:textSize="32dp"
47+
android:textSize="32sp"
4848
android:layout_marginTop="@dimen/activity_margin_vertical" />
4949

5050
<com.dinuscxj.progressbar.CircleProgressBar

0 commit comments

Comments
 (0)