From 04d96856b3bfa487aeea14089ed9c7b90b7ecf17 Mon Sep 17 00:00:00 2001
From: Ujjwal Agrawal <ujjwal.iitism@gmail.com>
Date: Wed, 2 May 2018 19:44:20 +0530
Subject: [PATCH] fixed issue in logout

---
 .../free/nrw/commons/auth/LoginActivity.java  |  27 ++++++++++++++----
 .../commons/theme/NavigationBaseActivity.java |  18 ++++++------
 .../drawable-hdpi/ic_person_black_24dp.png    | Bin 0 -> 314 bytes
 .../drawable-mdpi/ic_person_black_24dp.png    | Bin 0 -> 215 bytes
 .../drawable-xhdpi/ic_person_black_24dp.png   | Bin 0 -> 366 bytes
 .../drawable-xxhdpi/ic_person_black_24dp.png  | Bin 0 -> 533 bytes
 .../drawable-xxxhdpi/ic_person_black_24dp.png | Bin 0 -> 748 bytes
 app/src/main/res/menu/drawer.xml              |   2 +-
 app/src/main/res/values/strings.xml           |   2 ++
 9 files changed, 32 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_person_black_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_person_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_person_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_person_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_person_black_24dp.png

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 bb9cfbd3e..a596645f9 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
@@ -6,6 +6,7 @@ import android.accounts.AccountAuthenticatorResponse;
 import android.accounts.AccountManager;
 import android.app.Activity;
 import android.app.ProgressDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
@@ -16,6 +17,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;
@@ -39,6 +41,7 @@ import butterknife.ButterKnife;
 import butterknife.OnClick;
 import fr.free.nrw.commons.AboutActivity;
 import fr.free.nrw.commons.BuildConfig;
+import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.PageTitle;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
@@ -131,7 +134,15 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         signupButton.setOnClickListener(view -> signUp());
 
         forgotPasswordText.setOnClickListener(view -> forgotPassword());
-        skipLoginText.setOnClickListener(view -> skipLogin());
+        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));
@@ -141,7 +152,7 @@ public class LoginActivity extends AccountAuthenticatorActivity {
     }
 
     private void skipLogin() {
-        prefs.edit().putBoolean("isloggedin", false).apply();
+        prefs.edit().putBoolean("login_skipped", true).apply();
         NavigationBaseActivity.startActivityWithFlags(this, NearbyActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP);
         finish();
 
@@ -165,7 +176,6 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         }
     }
 
-
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
@@ -181,11 +191,16 @@ 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();
             startMainActivity();
         }
+
+        if (prefs.getBoolean("login_skipped", false)){
+            skipLogin();
+        }
+
     }
 
     @Override
diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
index 2a0bf1290..dcacb8d9a 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
@@ -65,21 +65,18 @@ public abstract class NavigationBaseActivity extends BaseActivity
         setDrawerPaneWidth();
         setUserName();
         Menu nav_Menu = navigationView.getMenu();
-        if (prefs.getBoolean("isloggedin", true)) {
-            Toast.makeText(this,"LoggedIn",Toast.LENGTH_SHORT).show();
-            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);
-
-        }else {
-            Toast.makeText(this,"Skipped",Toast.LENGTH_SHORT).show();
+        if (prefs.getBoolean("login_skipped", true)) {
             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 {
+            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);
         }
     }
 
@@ -129,6 +126,7 @@ public abstract class NavigationBaseActivity extends BaseActivity
                 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:
diff --git a/app/src/main/res/drawable-hdpi/ic_person_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_person_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a8a6c159b86c5e5e4cd0573a01103541825d2ce
GIT binary patch
literal 314
zcmV-A0mc4_P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00032Nkl<Zc-rmO
zOA0|z9LI6xRW=~+)vyJYAbDIHU@6MnNLIi=SLC$;2FxVgFi^+u*8dFe?Hum?8#w>^
zlsc(zbpD-4#EhBWO%g1y!GR|%p-X41Q-Cc95AIox^Oy09k=Bsl2(lDnqy|Tjtr0Zi
z2y!%nE`J%M^OsFIg4!BEb*^i_QHWVVoNE{5Y0voWpe*;cc9&iY=5T{METF@+5Y3ng
zVp33nK8#>b+xSJ?&pSHnL7Bc2_-(4egdSl+(*wp({r2|7Xe*yTi12cPCPZ~(O7t8R
zA#wLrQ8gw5#}H$r1Ef`gh72*%KqctP7^L)G63k4H2?{;Pj2WGI1FZ0oG;*cVssI20
M07*qoM6N<$f)<E}iU0rr

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_person_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_person_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..77c5bb8df415d9b26a6754c9ade789124d904ec2
GIT binary patch
literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj^E_P~Ln>~)y=2JOWFXO&=$9-d
zewX*V!9CaYE-JAPn5y`D^IVvHoF2&DT59NfRGyc!{?nTK)>{Hi?uX=Y_DYEcX`KA1
zZgt#QYtj9lX!lNsx13Xi8nfOwyy8?5Voa60BCEe)!Y|KLHW`^JlOA8*XUcb?@aX9s
z3Ww!ZD;_pHH}C#qt3+X|ea^oR?zoyDEwqDQVtbxq<2&#F{Aa%3e$BXfcGLNiqedw}
Pmoj*|`njxgN@xNAX8}}(

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_person_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_person_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d991b0e01342c1db4c70690014d3a84075da6960
GIT binary patch
literal 366
zcmV-!0g?WRP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0003sNkl<Zc-rlk
zOKQSU7=`1gaS?VZ4n*C9(0OrEm!!^A;=mmU9k#Pl1S#zTd~L#@C^|6l2!Egm^^to`
ze#-gan`Dx6a-VS=LI@$mE*02=bGQ>{(1Rt-!LzUr!!rg_&ea%xcp?06Ked(U-w;01
z(=_M97zSF_L@#E6qg@RJ<^}~O8Vc+T3T#=x0yBdGV+{p7g92?01xm6d#@R-TTF!zv
zTWLqrN$kq?;M(vX@Il*s$d!=@E=-$_#_*?WqAQ2gRvgQMEjok{l{~^aY{7Rpg+APi
zzC3$_P51(H8h&J&hS%xiJ*olANrle98vHQ`{g>bHS>ACM3h?U=!A~8*yzTH$aFsy#
z$R(`W{PLRw!$+=djl^pT;Ufn&3iv4&SlB2KrYsAvK-vWeA%y&24k_CU3BNz6B>(^b
M07*qoM6N<$g32zM*#H0l

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_person_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_person_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a9747527be0701e928d4d14313da2717e301ffa
GIT binary patch
literal 533
zcmV+w0_y#VP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!0005pNkl<Zc-rln
z!Ab&A6o!YQo}hN6)+VAd>OE?iVf6sfDhfp(pf>dw5f-&hU5C*!sBM(!B7!J$p(xWY
zo!Ll{*xYgE%>Ti+8D$n9b7$@xwJbsiA%qY@2q9r(8fIY;R$)`D$gvEJg)z(&Jcn&)
z|6%7lIT#H~oGn=IAxyWQa6@~XbRS{5-P3&K*e;pWc+aW37^ns#ngX4<7{~Ec)1$m?
zAW&P&lPzl?j$>LwprXM*c@2T81_PBf1Zo-#)L@_x1gda}4elm=r6EwpV4#$SKrurb
z#g?Ymjhul%Cz{^HqB75ME6xX;(Dp{Z;bNeK)|t@03vqU}PZg6g&*^7bC9IGTk$Fxp
zPq&ubkSDDW5|xofUUtO|u`HXwl(xwsA%qa3mmxS0H{qf6{Rf6y_#~UhmROTxozFVI
zsU66x%AA}-70WUcD)hO7{%J>DkaI2tHOeA9hR>F{VVPs+N;`sazegE{>+r^dD8E^P
zYkpjYtMFlfVY<DCD}D$w4ljKarrQfRHmEppS^u`reS`~M$C-t%0f^)H0%yF6Gb(G`
z4w!dv#EU>X0gU6g?M0wcfCF875$HX@f!@3bWCvUZVju=$AO;F^AVLTsgb+dqA^+nG
XT1%Lg#cEf600000NkvXXu0mjfVh-g~

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_person_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_person_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..295cb32568fc271b7183b89fbf4659987c3f4a75
GIT binary patch
literal 748
zcmV<I0u%j-P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h0008BNkl<Zc-rlp
zOG{Ky0LKqK%pSInS@h6?porQh^dS^0S_OTKS``^eAY_(d;0I|dScpPR%O0DWY!RfD
z8cqMhIRoSPn#Y}c&b{~dgWqNxeEk33bI-%8F#rGn00000000000P)Z#ughsUFTcxm
z@3Mc*er&|Q7ZT!}oRPm|wMkdy3pqf1?Q>X;$&D6*Z`58Lk7O@#w#Hfcwu9gsU6TF8
z+8meVw*<qlS&^5Bckkc)ZiHW70$0Kg97%ZC*=;!Dp0EvLDTH5hl(@G}H8)Z$V4b08
zGczfMUvrw+9miW-WF_T_JVyL(d!ZW0Vd8f~L8t<zh~I6Zg(_f<_}#8%r~)d)@1}&I
z3Rok43JA_JLl8INLi3zyXjn!97BEEoZaZK#K=?o9QQ{A`8fN&ZV<6?}sGWYECicyY
zrdYsz;@*lqCR|D(`~`W4xVNX@FOIqu{ug<Qn0Lqi>B!eEg@2KFo8ydJOnBJgrrX9n
z;bDifBRku9z?k3peZj61R!nQ>z0drW1PQK~hy4O-&fl!pycPf2l;2)pg$n=x0002c
z20g}Yp4l_wyYi)cCExjlmp#V(>sP*ijC-`{y?@WFyeDrMx4G9toO^RZ-jtK_jY;-|
z%ziGrA@|gOjS_JivtM2{?$M;ON&igPe$8<?DEAd9c>5UYW7FM(msYjs4-@iAUPC|V
zFa7z5Lf^^P@|OReb1}@^mY*{ae50S_9eE(D;SUBH+q-eExR#~hd;M(VUk<{rchY3w
z0q;^q#`#XpmP;{*{~^cW*Ze3?#uk2`U!hhDV%bFYU%8$XDE#Q2v_GH28*Ve&pZP)z
z1&kLk{F)On6tGy}0?IKI@T0&5{Enf3YQd!d3ZMWApa2S>01BW03MgU$0000000000
e0000GH~#_2@GKZZTeznH0000<MNUMnLSTY=8ex6_

literal 0
HcmV?d00001

diff --git a/app/src/main/res/menu/drawer.xml b/app/src/main/res/menu/drawer.xml
index 997d2fdde..e2729fdec 100644
--- a/app/src/main/res/menu/drawer.xml
+++ b/app/src/main/res/menu/drawer.xml
@@ -3,7 +3,7 @@
         <item
             android:id="@+id/action_login"
             android:visible="false"
-            android:icon="@drawable/ic_home_black_24dp"
+            android:icon="@drawable/ic_person_black_24dp"
             android:title="@string/navigation_item_login" />
     </group>
     <group android:id="@+id/drawer_main">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 109f59e8b..73b6f208d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -272,4 +272,6 @@
   <string name="retry">Retry</string>
   <string name="skip_login">Skip </string>
   <string name="navigation_item_login">Login</string>
+    <string name="skip_login_title">Do you really want to skip login ?</string>
+  <string name="skip_login_message">You might not be able to access some features of the app.</string>
 </resources>