From 99f6f9a9c1c910478b29bde50578e5e1837f95a3 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Sat, 21 Apr 2018 14:40:41 +0300
Subject: [PATCH] Minor auth and activity improvements

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../mthmmy/activities/LoginActivity.java      |  6 ++++
 .../thmmy/mthmmy/session/SessionManager.java  | 34 +++++++++++++------
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 118026f0..bf5256cd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -61,7 +61,7 @@
             android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".activities.AboutActivity"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTop"
             android:parentActivityName=".activities.main.MainActivity"
             android:theme="@style/AppTheme.NoActionBar">
             <meta-data
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java
index 89a1d8f8..6f632f97 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java
@@ -16,6 +16,7 @@ import gr.thmmy.mthmmy.activities.main.MainActivity;
 import gr.thmmy.mthmmy.base.BaseActivity;
 import timber.log.Timber;
 
+import static gr.thmmy.mthmmy.session.SessionManager.BANNED_USER;
 import static gr.thmmy.mthmmy.session.SessionManager.CONNECTION_ERROR;
 import static gr.thmmy.mthmmy.session.SessionManager.EXCEPTION;
 import static gr.thmmy.mthmmy.session.SessionManager.FAILURE;
@@ -175,6 +176,11 @@ public class LoginActivity extends BaseActivity {
                             "Wrong password!", Toast.LENGTH_LONG).show();
                     inputPassword.requestFocus();
                     break;
+                case BANNED_USER:
+                    Toast.makeText(getApplicationContext(),
+                            "You are banned!", Toast.LENGTH_LONG).show();
+                    inputPassword.requestFocus();
+                    break;
                 case FAILURE:
                     Toast.makeText(getApplicationContext(),
                             "Login failed...", Toast.LENGTH_LONG).show();
diff --git a/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java b/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java
index 961b998d..8d534293 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java
@@ -47,6 +47,7 @@ public class SessionManager {
     public static final int CANCELLED = 4;
     public static final int CONNECTION_ERROR = 5;
     public static final int EXCEPTION = 6;
+    public static final int BANNED_USER = 7;
 
     // Client & Cookies
     private final OkHttpClient client;
@@ -114,8 +115,8 @@ public class SessionManager {
                 setPersistentCookieSession();   //Store cookies
 
                 //Edit SharedPreferences, save session's data
+                setLoginScreenAsDefault(false);
                 sharedPrefs.edit().putBoolean(LOGGED_IN, true).apply();
-                sharedPrefs.edit().putBoolean(LOGIN_SCREEN_AS_DEFAULT, false).apply();
                 sharedPrefs.edit().putString(USERNAME, extractUserName(document)).apply();
                 String avatar = extractAvatarLink(document);
                 if (avatar != null) {
@@ -133,17 +134,23 @@ public class SessionManager {
 
                 //Investigate login failure
                 Elements error = document.select("b:contains(That username does not exist.)");
-                if (error.size() == 1) { //Wrong username
+                if (error.size() > 0) { //Wrong username
                     Timber.i("Wrong Username");
                     return WRONG_USER;
                 }
 
                 error = document.select("body:contains(Password incorrect)");
-                if (error.size() == 1) { //Wrong password
+                if (error.size() > 0) { //Wrong password
                     Timber.i("Wrong Password");
                     return WRONG_PASSWORD;
                 }
 
+                error = document.select("body:contains(you are banned from using this forum!),body:contains(έχετε αποκλειστεί από αυτή τη δημόσια συζήτηση!)");
+                if (error.size() > 0) { //User is banned
+                    Timber.i("User is banned");
+                    return BANNED_USER;
+                }
+
                 //Other error e.g. session was reset server-side
                 clearSessionData(); //Clear invalid saved data
                 return FAILURE;
@@ -180,7 +187,7 @@ public class SessionManager {
         } else if (isLoginScreenDefault())
             return;
 
-        sharedPrefs.edit().putBoolean(LOGIN_SCREEN_AS_DEFAULT, true).apply();
+        setLoginScreenAsDefault(true);
         clearSessionData();
     }
 
@@ -190,7 +197,7 @@ public class SessionManager {
     public void guestLogin() {
         Timber.i("Continuing as a guest, as chosen by the user.");
         clearSessionData();
-        sharedPrefs.edit().putBoolean(LOGIN_SCREEN_AS_DEFAULT, false).apply();
+        setLoginScreenAsDefault(false);
     }
 
 
@@ -219,7 +226,7 @@ public class SessionManager {
                 return FAILURE;
             }
         } catch (IOException e) {
-            Timber.w("Logout IOException", e);
+            Timber.w(e, "Logout IOException");
             return CONNECTION_ERROR;
         } catch (Exception e) {
             Timber.e(e, "Logout Exception");
@@ -253,16 +260,17 @@ public class SessionManager {
         return sharedPrefs.getBoolean(LOGIN_SCREEN_AS_DEFAULT, true);
     }
 
-    public String getCookieHeader() {
-        return cookiePersistor.loadAll().get(0).toString();
-    }
-
     //--------------------------------------GETTERS END---------------------------------------------
 
     //------------------------------------OTHER FUNCTIONS-------------------------------------------
     private boolean validateRetrievedCookies() {
         List<Cookie> cookieList = cookieJar.loadForRequest(indexUrl);
-        return (cookieList.size() == 2) && (cookieList.get(0).name().equals("THMMYgrC00ki3")) && (cookieList.get(1).name().equals("PHPSESSID"));
+        for(Cookie cookie: cookieList)
+        {
+            if(cookie.name().equals("THMMYgrC00ki3"))
+                return true;
+        }
+        return false;
     }
 
     // Call validateRetrievedCookies() first
@@ -288,6 +296,10 @@ public class SessionManager {
         Timber.i("Session data cleared.");
     }
 
+    private void setLoginScreenAsDefault(boolean b){
+        sharedPrefs.edit().putBoolean(LOGIN_SCREEN_AS_DEFAULT, b).apply();
+    }
+
     @NonNull
     private String extractUserName(@NonNull Document doc) {
         //Scribbles2 Theme