Merge branch 'skip_login' of github.com:ujjwalagrawal17/apps-android-commons

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

@@ -16,6 +16,7 @@ import android.support.annotation.StringRes;
 import android.support.design.widget.TextInputLayout;
 import android.support.v4.app.NavUtils;
 import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatDelegate;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -26,6 +27,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import java.io.IOException;
 import java.util.Locale;
@@ -41,6 +43,7 @@ import fr.free.nrw.commons.PageTitle;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.WelcomeActivity;
+import fr.free.nrw.commons.category.CategoryImagesActivity;
 import fr.free.nrw.commons.contributions.ContributionsActivity;
 import fr.free.nrw.commons.di.ApplicationlessInjection;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
@@ -60,6 +63,7 @@ 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;
     @Inject SessionManager sessionManager;
@@ -76,6 +80,7 @@ public class LoginActivity extends AccountAuthenticatorActivity {
     @BindView(R.id.login_credentials) TextView loginCredentials;
     @BindView(R.id.two_factor_container) TextInputLayout twoFactorContainer;
     @BindView(R.id.forgotPassword) HtmlTextView forgotPasswordText;
+    @BindView(R.id.skipLogin) HtmlTextView skipLoginText;
 
     ProgressDialog progressDialog;
     private AppCompatDelegate delegate;
@@ -125,6 +130,15 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         signupButton.setOnClickListener(view -> signUp());
 
         forgotPasswordText.setOnClickListener(view -> forgotPassword());
+        skipLoginText.setOnClickListener(view -> new AlertDialog.Builder(this).setTitle(R.string.skip_login_title)
+                .setMessage(R.string.skip_login_message)
+                .setCancelable(false)
+                .setPositiveButton(R.string.yes, (dialog, which) -> {
+                    dialog.cancel();
+                    skipLogin();
+                })
+                .setNegativeButton(R.string.no, (dialog, which) -> dialog.cancel())
+                .show());
 
         if(BuildConfig.FLAVOR.equals("beta")){
             loginCredentials.setText(getString(R.string.login_credential));
@@ -133,6 +147,17 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         }
     }
 
+    /**
+     * This function is called when user skips the login.
+     * It redirects the user to Explore Activity.
+     */
+    private void skipLogin() {
+        prefs.edit().putBoolean("login_skipped", true).apply();
+        CategoryImagesActivity.startYourself(this, getString(R.string.title_activity_explore), FEATURED_IMAGES_CATEGORY);
+        finish();
+
+    }
+
     private void forgotPassword() {
         Utils.handleWebUrl(this, Uri.parse(BuildConfig.FORGOT_PASSWORD_URL));
     }
@@ -159,9 +184,15 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         if (sessionManager.getCurrentAccount() != null
                 && sessionManager.isUserLoggedIn()
                 && sessionManager.getCachedAuthCookie() != null) {
+            prefs.edit().putBoolean("login_skipped", false).apply();
             sessionManager.revalidateAuthToken();
             startMainActivity();
         }
+
+        if (prefs.getBoolean("login_skipped", false)){
+            skipLogin();
+        }
+
     }
 
     @Override

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;
@@ -51,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,

app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java

@@ -15,6 +15,7 @@ import android.support.annotation.Nullable;
 import android.support.design.widget.BottomSheetBehavior;
 import android.support.design.widget.CoordinatorLayout;
 import android.support.design.widget.FloatingActionButton;
+import android.support.v7.app.AlertDialog;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -53,8 +54,10 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 import dagger.android.support.DaggerFragment;
+import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
+import fr.free.nrw.commons.auth.LoginActivity;
 import fr.free.nrw.commons.contributions.ContributionController;
 import fr.free.nrw.commons.utils.ContributionUtils;
 import fr.free.nrw.commons.utils.UriDeserializer;
@@ -68,6 +71,8 @@ import static fr.free.nrw.commons.wikidata.WikidataConstants.WIKIDATA_ENTITY_ID_
 
 public class NearbyMapFragment extends DaggerFragment {
 
+    @Inject
+    @Named("application_preferences") SharedPreferences applicationPrefs;
     public MapView mapView;
     private List<NearbyBaseMarker> baseMarkerOptions;
     private fr.free.nrw.commons.location.LatLng curLatLng;
@@ -373,7 +378,23 @@ public class NearbyMapFragment extends DaggerFragment {
     }
 
     private void setListeners() {
-        fabPlus.setOnClickListener(view -> animateFAB(isFabOpen));
+        fabPlus.setOnClickListener(view -> {
+            if (applicationPrefs.getBoolean("login_skipped", true)) {
+                // prompt the user to login
+                new AlertDialog.Builder(getContext())
+                        .setMessage(R.string.login_alert_message)
+                        .setPositiveButton(R.string.login, (dialog, which) -> {
+                            // logout of the app
+                            BaseLogoutListener logoutListener = new BaseLogoutListener();
+                            CommonsApplication app = (CommonsApplication) getActivity().getApplication();
+                            app.clearApplicationData(getContext(), logoutListener);
+
+                        })
+                        .show();
+            }else {
+                animateFAB(isFabOpen);
+            }
+        });
 
         bottomSheetDetails.setOnClickListener(view -> {
             if (bottomSheetDetailsBehavior.getState() == BottomSheetBehavior.STATE_COLLAPSED) {
@@ -491,6 +512,21 @@ 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() {
+            Timber.d("Logout complete callback received.");
+            Intent nearbyIntent = new Intent( getActivity(), LoginActivity.class);
+            nearbyIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+            nearbyIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(nearbyIntent);
+            getActivity().finish();
+        }
+    }
+
     /**
      * Adds a marker for the user's current position. Adds a
      * circle which uses the accuracy * 2, to draw a circle

app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java

@@ -6,6 +6,7 @@ import android.net.Uri;
 import android.content.SharedPreferences;
 import android.support.v4.app.Fragment;
 import android.support.transition.TransitionManager;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.PopupMenu;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -27,12 +28,17 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
+import fr.free.nrw.commons.auth.LoginActivity;
 import fr.free.nrw.commons.contributions.ContributionController;
 import fr.free.nrw.commons.di.ApplicationlessInjection;
 import timber.log.Timber;
 
+import static fr.free.nrw.commons.theme.NavigationBaseActivity.startActivityWithFlags;
+
 public class PlaceRenderer extends Renderer<Place> {
 
+    @Inject
+    @Named("application_preferences") SharedPreferences applicationPrefs;
     @BindView(R.id.tvName) TextView tvName;
     @BindView(R.id.tvDesc) TextView tvDesc;
     @BindView(R.id.distance) TextView distance;
@@ -88,9 +94,9 @@ public class PlaceRenderer extends Renderer<Place> {
             Log.d("Renderer", "clicked");
             TransitionManager.beginDelayedTransition(buttonLayout);
 
-            if(buttonLayout.isShown()){
+            if (buttonLayout.isShown()) {
                 closeLayout(buttonLayout);
-            }else {
+            } else {
                 openLayout(buttonLayout);
             }
 
@@ -106,18 +112,46 @@ public class PlaceRenderer extends Renderer<Place> {
         });
 
         cameraButton.setOnClickListener(view2 -> {
-            Timber.d("Camera button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription());
+            if (applicationPrefs.getBoolean("login_skipped", true)) {
-            DirectUpload directUpload = new DirectUpload(fragment, controller);
+                // prompt the user to login
-            storeSharedPrefs();
+                new AlertDialog.Builder(getContext())
-            directUpload.initiateCameraUpload();
+                        .setMessage(R.string.login_alert_message)
+                        .setPositiveButton(R.string.login, (dialog, which) -> {
+                            startActivityWithFlags( getContext(), LoginActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP,
+                                    Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                            prefs.edit().putBoolean("login_skipped", false).apply();
+                            fragment.getActivity().finish();
+                        })
+                        .show();
+            } else {
+                Timber.d("Camera button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription());
+                DirectUpload directUpload = new DirectUpload(fragment, controller);
+                storeSharedPrefs();
+                directUpload.initiateCameraUpload();
+            }
         });
 
+
         galleryButton.setOnClickListener(view3 -> {
-            Timber.d("Gallery button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription());
+            if (applicationPrefs.getBoolean("login_skipped", true)) {
-            DirectUpload directUpload = new DirectUpload(fragment, controller);
+                // prompt the user to login
-            storeSharedPrefs();
+                new AlertDialog.Builder(getContext())
-            directUpload.initiateGalleryUpload();
+                        .setMessage(R.string.login_alert_message)
+                        .setPositiveButton(R.string.login, (dialog, which) -> {
+                            startActivityWithFlags( getContext(), LoginActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP,
+                                    Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                            prefs.edit().putBoolean("login_skipped", false).apply();
+                            fragment.getActivity().finish();
+                        })
+                        .show();
+            }else {
+                Timber.d("Gallery button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription());
+                DirectUpload directUpload = new DirectUpload(fragment, controller);
+                storeSharedPrefs();
+                directUpload.initiateGalleryUpload();
+            }
         });
+
     }
 
     private void storeSharedPrefs() {

app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java

@@ -5,6 +5,7 @@ import android.accounts.AccountManager;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.design.widget.NavigationView;
@@ -12,6 +13,7 @@ import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -19,6 +21,9 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+
 import butterknife.BindView;
 import fr.free.nrw.commons.AboutActivity;
 import fr.free.nrw.commons.BuildConfig;
@@ -46,6 +51,8 @@ public abstract class NavigationBaseActivity extends BaseActivity
     NavigationView navigationView;
     @BindView(R.id.drawer_layout)
     DrawerLayout drawerLayout;
+    @Inject @Named("application_preferences") SharedPreferences prefs;
+
 
     private ActionBarDrawerToggle toggle;
 
@@ -61,6 +68,24 @@ public abstract class NavigationBaseActivity extends BaseActivity
         toggle.syncState();
         setDrawerPaneWidth();
         setUserName();
+        Menu nav_Menu = navigationView.getMenu();
+        View headerLayout = navigationView.getHeaderView(0);
+        ImageView userIcon = headerLayout.findViewById(R.id.user_icon);
+        if (prefs.getBoolean("login_skipped", false)) {
+            userIcon.setVisibility(View.GONE);
+            nav_Menu.findItem(R.id.action_login).setVisible(true);
+            nav_Menu.findItem(R.id.action_home).setVisible(false);
+            nav_Menu.findItem(R.id.action_notifications).setVisible(false);
+            nav_Menu.findItem(R.id.action_settings).setVisible(false);
+            nav_Menu.findItem(R.id.action_logout).setVisible(false);
+        }else {
+            userIcon.setVisibility(View.VISIBLE);
+            nav_Menu.findItem(R.id.action_login).setVisible(false);
+            nav_Menu.findItem(R.id.action_home).setVisible(true);
+            nav_Menu.findItem(R.id.action_notifications).setVisible(true);
+            nav_Menu.findItem(R.id.action_settings).setVisible(true);
+            nav_Menu.findItem(R.id.action_logout).setVisible(true);
+        }
     }
 
     /**
@@ -120,6 +145,14 @@ public abstract class NavigationBaseActivity extends BaseActivity
     public boolean onNavigationItemSelected(@NonNull final MenuItem item) {
         final int itemId = item.getItemId();
         switch (itemId) {
+            case R.id.action_login:
+                drawerLayout.closeDrawer(navigationView);
+                startActivityWithFlags(
+                        this, LoginActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP,
+                        Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                prefs.edit().putBoolean("login_skipped", false).apply();
+                finish();
+                return true;
             case R.id.action_home:
                 drawerLayout.closeDrawer(navigationView);
                 startActivityWithFlags(

app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java

@@ -18,6 +18,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
+import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.annotation.RequiresApi;
 import android.support.design.widget.FloatingActionButton;
@@ -103,6 +104,7 @@ public class ShareActivity
     ModifierSequenceDao modifierSequenceDao;
     @Inject
     CategoryApi apiCall;
+    @Inject @Named("application_preferences") SharedPreferences applicationPrefs;
     @Inject
     @Named("default_preferences")
     SharedPreferences prefs;
@@ -341,6 +343,12 @@ public class ShareActivity
         checkIfFileExists();
         gpsObj = fileObj.processFileCoordinates(locationPermitted);
         decimalCoords = fileObj.getDecimalCoords();
+        if (sessionManager.getCurrentAccount() == null) {
+            Toast.makeText(this, getString(R.string.login_alert_message), Toast.LENGTH_SHORT).show();
+            applicationPrefs.edit().putBoolean("login_skipped", false).apply();
+            Intent loginIntent = new Intent(ShareActivity.this, LoginActivity.class);
+            startActivity(loginIntent);
+        }
     }
 
     /**

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

@@ -207,6 +207,16 @@
                     android:layout_marginBottom="@dimen/standard_gap"
                     android:text="@string/forgot_password" />
 
+                <fr.free.nrw.commons.ui.widget.HtmlTextView
+                    android:visibility="visible"
+                    android:id="@+id/skipLogin"
+                    android:layout_width="match_parent"
+                    android:gravity="center_horizontal"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/forgotPassword"
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:text="@string/skip_login" />
+
             </RelativeLayout>
 
         </android.support.v7.widget.CardView>

app/src/main/res/menu/drawer.xml

@@ -1,4 +1,11 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <group android:id="@+id/drawer_login">
+        <item
+            android:id="@+id/action_login"
+            android:visible="false"
+            android:icon="@drawable/ic_person_black_24dp"
+            android:title="@string/navigation_item_login" />
+    </group>
     <group android:id="@+id/drawer_main">
         <item
             android:id="@+id/action_home"

app/src/main/res/values/strings.xml

@@ -247,6 +247,11 @@
   <string name="nominated_for_deletion">This image has been nominated for deletion.</string>
   <string name="nominated_see_more"><u>See webpage for details</u></string>
   <string name="view_browser">View in Browser</string>
+  <string name="skip_login">Skip</string>
+  <string name="navigation_item_login">Log in</string>
+  <string name="skip_login_title">Do you really want to skip login?</string>
+  <string name="skip_login_message">You will not be able to upload pictures.</string>
+  <string name="login_alert_message">Please log in to use this feature</string>
 
   <string name="nearby_location_has_not_changed">Location has not changed.</string>
   <string name="nearby_location_not_available">Location not available.</string>