From 987fff0c380f2ea72b876d2aaa018c41b5e63eda Mon Sep 17 00:00:00 2001 From: Ujjwal Agrawal Date: Tue, 31 Jul 2018 12:40:12 +0530 Subject: [PATCH] Javadocs added --- .../main/java/fr/free/nrw/commons/auth/LoginActivity.java | 4 ++-- .../java/fr/free/nrw/commons/nearby/NearbyActivity.java | 7 +++---- .../fr/free/nrw/commons/nearby/NearbyListFragment.java | 2 +- .../fr/free/nrw/commons/nearby/NearbyMapFragment.java | 8 ++++---- 4 files changed, 10 insertions(+), 11 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 959317c1f..0660c9043 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 @@ -183,8 +183,8 @@ public class LoginActivity extends AccountAuthenticatorActivity { } if (sessionManager.getCurrentAccount() != null - && sessionManager.isUserLoggedIn() - && sessionManager.getCachedAuthCookie() != null) { + && sessionManager.isUserLoggedIn() + && sessionManager.getCachedAuthCookie() != null) { prefs.edit().putBoolean("login_skipped", false).apply(); sessionManager.revalidateAuthToken(); startMainActivity(); 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 d49bf0147..0d1db62f1 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 @@ -15,7 +15,6 @@ import android.support.annotation.NonNull; import android.support.design.widget.BottomSheetBehavior; import android.support.v4.app.FragmentTransaction; import android.support.v7.app.AlertDialog; - import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -33,9 +32,7 @@ import javax.inject.Named; import butterknife.BindView; import butterknife.ButterKnife; -import fr.free.nrw.commons.CommonsApplication; import fr.free.nrw.commons.R; -import fr.free.nrw.commons.auth.LoginActivity; import fr.free.nrw.commons.location.LatLng; import fr.free.nrw.commons.location.LocationServiceManager; import fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType; @@ -53,8 +50,10 @@ import timber.log.Timber; import uk.co.deanwild.materialshowcaseview.IShowcaseListener; import uk.co.deanwild.materialshowcaseview.MaterialShowcaseView; -import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.*; +import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.LOCATION_SIGNIFICANTLY_CHANGED; +import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.LOCATION_SLIGHTLY_CHANGED; import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.MAP_UPDATED; +import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.PERMISSION_JUST_GRANTED; public class NearbyActivity extends NavigationBaseActivity implements LocationUpdateListener, 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 8eed81208..0599b4fe2 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 @@ -38,7 +38,6 @@ import static android.content.pm.PackageManager.PERMISSION_GRANTED; import static fr.free.nrw.commons.wikidata.WikidataConstants.WIKIDATA_ENTITY_ID_PREF; public class NearbyListFragment extends DaggerFragment { - private Bundle bundleForUpdates; // Carry information from activity about changed nearby places and current location private static final Type LIST_TYPE = new TypeToken>() { @@ -140,6 +139,7 @@ public class NearbyListFragment extends DaggerFragment { } } + @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); 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 39a8461d1..97806cd67 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 @@ -384,9 +384,6 @@ public class NearbyMapFragment extends DaggerFragment { .setMessage(R.string.login_alert_message) .setPositiveButton(R.string.login, (dialog, which) -> { // logout of the app -// startActivityWithFlags( getContext(), CategoryImagesActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP, -// Intent.FLAG_ACTIVITY_SINGLE_TOP); -// getActivity().finish(); BaseLogoutListener logoutListener = new BaseLogoutListener(); CommonsApplication app = (CommonsApplication) getActivity().getApplication(); app.clearApplicationData(getContext(), logoutListener); @@ -514,6 +511,9 @@ public class NearbyMapFragment extends DaggerFragment { mapView.setStyleUrl("asset://mapstyle.json"); } + /** + * onLogoutComplete is called after shared preferences and data stored in local database are cleared. + */ private class BaseLogoutListener implements CommonsApplication.LogoutListener { @Override public void onLogoutComplete() { @@ -816,7 +816,7 @@ public class NearbyMapFragment extends DaggerFragment { } private void animateFAB(boolean isFabOpen) { - this.isFabOpen = !isFabOpen; + this.isFabOpen = !isFabOpen; if (fabPlus.isShown()){ if (isFabOpen) { fabPlus.startAnimation(rotate_backward);