mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix code quality issues (#2359)

Browse source 
* 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
This commit is contained in:
Ronak Lakhotia 2019-02-22 17:21:58 +08:00 • committed by Vivek Maskara
parent 9882d24651
commit 01a7526477
6 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,7 @@ import android.widget.TextView;
import java.io.IOException; import java.io.IOException;
import java.util.Locale; import java.util.Locale;
import java.util.Objects;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; 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 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"; private static final String FEATURED_IMAGES_CATEGORY = "Category:Featured_pictures_on_Wikimedia_Commons";
@Inject MediaWikiApi mwApi; @Inject MediaWikiApi mwApi;
@ -387,10 +387,10 @@ public class LoginActivity extends AccountAuthenticatorActivity {
super.onRestoreInstanceState(savedInstanceState); super.onRestoreInstanceState(savedInstanceState);
loginCurrentlyInProgress = savedInstanceState.getBoolean(LOGGING_IN, false); loginCurrentlyInProgress = savedInstanceState.getBoolean(LOGGING_IN, false);
errorMessageShown = savedInstanceState.getBoolean(ERROR_MESSAGE_SHOWN, false); errorMessageShown = savedInstanceState.getBoolean(ERROR_MESSAGE_SHOWN, false);
if (loginCurrentlyInProgress){ if (loginCurrentlyInProgress) {
performLogin(); performLogin();
} }
if (errorMessageShown){ if (errorMessageShown) {
resultantError = savedInstanceState.getString(RESULTANT_ERROR); resultantError = savedInstanceState.getString(RESULTANT_ERROR);
handleOtherResults(resultantError); handleOtherResults(resultantError);
} }

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

@ -12,6 +12,7 @@ import android.widget.TextView;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.Locale;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;

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

@ -9,6 +9,7 @@ import java.text.SimpleDateFormat;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Locale;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;

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

@ -30,7 +30,7 @@ public class DeleteTask extends AsyncTask<Void, Integer, Boolean> {
@Inject MediaWikiApi mwApi; @Inject MediaWikiApi mwApi;
@Inject SessionManager sessionManager; @Inject SessionManager sessionManager;
public static final int NOTIFICATION_DELETE = 1; private static final int NOTIFICATION_DELETE = 1;
private NotificationManager notificationManager; private NotificationManager notificationManager;
private Builder notificationBuilder; private Builder notificationBuilder;
@ -113,11 +113,11 @@ public class DeleteTask extends AsyncTask<Void, Integer, Boolean> {
publishProgress(4); publishProgress(4);
mwApi.appendEdit(editToken,userPageString+"\n", mwApi.appendEdit(editToken,userPageString+"\n",
"User_Talk:"+sessionManager.getCurrentAccount().name,summary); "User_Talk:"+ sessionManager.getCurrentAccount().name,summary);
publishProgress(5); publishProgress(5);
} }
catch (Exception e) { catch (Exception e) {
Timber.d(e.getMessage()); Timber.e(e);
return false; return false;
} }
return true; return true;
@ -160,7 +160,7 @@ public class DeleteTask extends AsyncTask<Void, Integer, Boolean> {
@Override @Override
protected void onPostExecute(Boolean result) { protected void onPostExecute(Boolean result) {
String message = ""; String message;
String title = "Nominating for Deletion"; String title = "Nominating for Deletion";
if (result){ if (result){

2
app/src/main/res/layout/activity_achievements.xml
View file

@ -149,7 +149,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/achievements_revert_limit_message" android:text="@string/achievements_revert_limit_message"
android:textSize="10dp" android:textSize="10sp"
android:id="@+id/images_revert_limit_text" android:id="@+id/images_revert_limit_text"
android:layout_marginLeft="@dimen/activity_margin_horizontal" android:layout_marginLeft="@dimen/activity_margin_horizontal"
android:layout_marginStart="@dimen/activity_margin_horizontal" android:layout_marginStart="@dimen/activity_margin_horizontal"

2
app/src/main/res/layout/activity_quiz_result.xml
View file

@ -44,7 +44,7 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="@string/result" android:text="@string/result"
style="?android:textAppearanceLarge" style="?android:textAppearanceLarge"
android:textSize="32dp" android:textSize="32sp"
android:layout_marginTop="@dimen/activity_margin_vertical" /> android:layout_marginTop="@dimen/activity_margin_vertical" />
<com.dinuscxj.progressbar.CircleProgressBar <com.dinuscxj.progressbar.CircleProgressBar