diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/main/unread/UnreadFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/main/unread/UnreadFragment.java index a8ba7f10..124c35c4 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/activities/main/unread/UnreadFragment.java +++ b/app/src/main/java/gr/thmmy/mthmmy/activities/main/unread/UnreadFragment.java @@ -26,19 +26,17 @@ import java.util.ArrayList; import java.util.List; import gr.thmmy.mthmmy.R; -import gr.thmmy.mthmmy.base.BaseApplication; import gr.thmmy.mthmmy.base.BaseFragment; import gr.thmmy.mthmmy.model.TopicSummary; import gr.thmmy.mthmmy.session.InvalidSessionException; +import gr.thmmy.mthmmy.session.MarkAsReadTask; import gr.thmmy.mthmmy.session.SessionManager; -import gr.thmmy.mthmmy.session.ValidateSessionTask; import gr.thmmy.mthmmy.utils.networking.NetworkResultCodes; import gr.thmmy.mthmmy.utils.parsing.NewParseTask; import gr.thmmy.mthmmy.utils.parsing.ParseException; import gr.thmmy.mthmmy.views.CustomRecyclerView; import me.zhanghai.android.materialprogressbar.MaterialProgressBar; import okhttp3.Response; -import timber.log.Timber; /** * A {@link BaseFragment} subclass. @@ -60,13 +58,11 @@ public class UnreadFragment extends BaseFragment { private UnreadAdapter unreadAdapter; private List topicSummaries; - private String markAsReadUrl; private int numberOfPages = 0; private int loadedPages = 0; private UnreadTask unreadTask; - private MarkReadTask markReadTask; - private ValidateSessionTask validateSessionTask; + private MarkAsReadTask markAsReadTask; // Required empty public constructor public UnreadFragment() {} @@ -90,11 +86,6 @@ public class UnreadFragment extends BaseFragment { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); topicSummaries = new ArrayList<>(); - markAsReadUrl = BaseApplication.getInstance().getSessionManager().getMarkAllAsReadLink(); - if(markAsReadUrl==null){ - Timber.i("MarkAsRead URL is null."); - startValidateSessionTask(); - } } @Override @@ -105,7 +96,7 @@ public class UnreadFragment extends BaseFragment { assert SessionManager.unreadUrl != null; unreadTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, SessionManager.unreadUrl.toString()); } - markReadTask = new MarkReadTask(this::onMarkReadTaskStarted, this::onMarkReadTaskFinished); + markAsReadTask = new MarkAsReadTask(UnreadFragment.this::onMarkAsReadTaskStarted, UnreadFragment.this::onMarkAsReadTaskFinished); } @@ -146,17 +137,10 @@ public class UnreadFragment extends BaseFragment { public void onDestroy() { super.onDestroy(); cancelUnreadTaskIfRunning(); - if (markReadTask!=null){ - try{ - if(markReadTask.isRunning()) - markReadTask.cancel(true); - } // Yes, it happens even though we checked - catch (NullPointerException ignored){ } - } - if (validateSessionTask!=null){ + if (markAsReadTask !=null){ try{ - if(validateSessionTask.isRunning()) - validateSessionTask.cancel(true); + if(markAsReadTask.isRunning()) + markAsReadTask.cancel(true); } // Yes, it happens even though we checked catch (NullPointerException ignored){ } } @@ -179,11 +163,6 @@ public class UnreadFragment extends BaseFragment { } } - private void startValidateSessionTask(){ - validateSessionTask = new ValidateSessionTask(); - validateSessionTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); - } - private void cancelUnreadTaskIfRunning(){ if (unreadTask!=null){ try{ @@ -215,9 +194,9 @@ public class UnreadFragment extends BaseFragment { builder.setTitle("Mark all as read"); builder.setMessage("Are you sure that you want to mark ALL topics as read?"); builder.setPositiveButton("Yep", (dialogInterface, i) -> { - if (!markReadTask.isRunning() && markAsReadUrl!=null){ - markReadTask = new MarkReadTask(this::onMarkReadTaskStarted, this::onMarkReadTaskFinished); - markReadTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, markAsReadUrl); + if (!markAsReadTask.isRunning()){ + markAsReadTask = new MarkAsReadTask(this::onMarkAsReadTaskStarted, this::onMarkAsReadTaskFinished); + markAsReadTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } }); builder.setNegativeButton("Nope", (dialogInterface, i) -> {}); @@ -304,12 +283,10 @@ public class UnreadFragment extends BaseFragment { } Element topBar = document.select("table:not(.bordercolor):not(#bodyarea):has(td.middletext)").first(); - Element pagesElement = null, markRead = null; - if (topBar != null) { + Element pagesElement = null; + if (topBar != null) pagesElement = topBar.select("td.middletext").first(); - markRead = document.select("table:not(.bordercolor):not([width])").select("a") - .first(); - } + if (numberOfPages == 0 && pagesElement != null) { Elements pages = pagesElement.select("a"); @@ -319,14 +296,6 @@ public class UnreadFragment extends BaseFragment { numberOfPages = 1; } - if (markRead != null && loadedPages == numberOfPages - 1){ - String retrievedMarkAsReadUrl = markRead.attr("href"); - if(!retrievedMarkAsReadUrl.equals(markAsReadUrl)) { - markAsReadUrl = retrievedMarkAsReadUrl; - BaseApplication.getInstance().getSessionManager().refreshSescFromUrl(retrievedMarkAsReadUrl); - } - } - return fetchedTopicSummaries; } return new ArrayList<>(); @@ -338,13 +307,13 @@ public class UnreadFragment extends BaseFragment { } } - //---------------------------------------MARKREAD TASK------------------------------------------ - private void onMarkReadTaskStarted() { + //---------------------------------------MARK AS READ TASK------------------------------------------ + private void onMarkAsReadTaskStarted() { cancelUnreadTaskIfRunning(); progressBar.setVisibility(ProgressBar.VISIBLE); } - private void onMarkReadTaskFinished(int resultCode, Void isSessionVerified) { + private void onMarkAsReadTaskFinished(int resultCode, Void v) { hideProgressUI(); if (resultCode == NetworkResultCodes.SUCCESSFUL) startUnreadTask(); @@ -352,35 +321,11 @@ public class UnreadFragment extends BaseFragment { hideProgressUI(); if (resultCode == NetworkResultCodes.NETWORK_ERROR) Toast.makeText(getContext(), "Network error", Toast.LENGTH_SHORT).show(); - else if (resultCode == SessionManager.INVALID_SESSION){ + else if (resultCode == SessionManager.INVALID_SESSION) Toast.makeText(getContext(), "Session verification failed. Please try logging out and back in again", Toast.LENGTH_LONG).show(); - startValidateSessionTask(); - } else Toast.makeText(getContext(), "Unexpected error," + " please contact the developers with the details", Toast.LENGTH_LONG).show(); } } - - private class MarkReadTask extends NewParseTask { - MarkReadTask(OnTaskStartedListener onTaskStartedListener, OnNetworkTaskFinishedListener onParseTaskFinishedListener) { - super(onTaskStartedListener, onParseTaskFinishedListener); - } - - @Override - protected Void parse(Document document, Response response) throws ParseException { - Elements sessionVerificationFailed = document.select("td:containsOwn(Session " + - "verification failed. Please try logging out and back in again, and then try " + - "again.), td:containsOwn(Η επαλήθευση συνόδου απέτυχε. Παρακαλούμε κάντε " + - "αποσύνδεση, επανασύνδεση και ξαναδοκιμάστε.)"); - if(!sessionVerificationFailed.isEmpty()) - throw new InvalidSessionException(); - return null; - } - - @Override - protected int getResultCode(Response response, Void v) { - return NetworkResultCodes.SUCCESSFUL; - } - } } diff --git a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java index defaa6d3..6c571129 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java +++ b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java @@ -62,9 +62,11 @@ import gr.thmmy.mthmmy.model.Bookmark; import gr.thmmy.mthmmy.model.ThmmyFile; import gr.thmmy.mthmmy.services.DownloadHelper; import gr.thmmy.mthmmy.services.UploadsReceiver; +import gr.thmmy.mthmmy.session.LogoutTask; import gr.thmmy.mthmmy.session.SessionManager; import gr.thmmy.mthmmy.utils.FileUtils; import gr.thmmy.mthmmy.utils.io.AssetUtils; +import gr.thmmy.mthmmy.utils.networking.NetworkResultCodes; import gr.thmmy.mthmmy.viewmodel.BaseViewModel; import me.zhanghai.android.materialprogressbar.MaterialProgressBar; import okhttp3.OkHttpClient; @@ -82,7 +84,6 @@ import static gr.thmmy.mthmmy.activities.profile.ProfileActivity.BUNDLE_PROFILE_ import static gr.thmmy.mthmmy.activities.settings.SettingsActivity.DEFAULT_HOME_TAB; import static gr.thmmy.mthmmy.services.DownloadHelper.SAVE_DIR; import static gr.thmmy.mthmmy.services.UploadsReceiver.UPLOAD_ID_KEY; -import static gr.thmmy.mthmmy.session.SessionManager.SUCCESS; import static gr.thmmy.mthmmy.utils.FileUtils.getMimeType; public abstract class BaseActivity extends AppCompatActivity { @@ -497,47 +498,35 @@ public abstract class BaseActivity extends AppCompatActivity { } //-------------------------------------------LOGOUT------------------------------------------------- - - /** - * Result toast will always display a success, because when user chooses logout all data are - * cleared regardless of the actual outcome - */ - private class LogoutTask extends AsyncTask { //Attempt logout - ProgressDialog progressDialog; - - protected Integer doInBackground(Void... voids) { - return sessionManager.logout(); - } - - protected void onPreExecute() { //Show a progress dialog until done - progressDialog = new ProgressDialog(BaseActivity.this, - R.style.AppTheme_Dark_Dialog); - progressDialog.setCancelable(false); - progressDialog.setIndeterminate(true); - progressDialog.setMessage("Logging out..."); - progressDialog.show(); - } - - protected void onPostExecute(Integer result) { - if (result == SUCCESS) { - SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); - if (sharedPrefs.getString(DEFAULT_HOME_TAB, "0").equals("2")) { - SharedPreferences.Editor editor = sharedPrefs.edit(); - editor.putString(DEFAULT_HOME_TAB, "0").apply(); - } + private ProgressDialog progressDialog; + private void onLogoutTaskStarted() { + progressDialog = new ProgressDialog(BaseActivity.this, + R.style.AppTheme_Dark_Dialog); + progressDialog.setCancelable(false); + progressDialog.setIndeterminate(true); + progressDialog.setMessage("Logging out..."); + progressDialog.show(); + } + + private void onLogoutTaskFinished(int resultCode, Void v) { + if (resultCode == NetworkResultCodes.SUCCESSFUL) { + SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); + if (sharedPrefs.getString(DEFAULT_HOME_TAB, "0").equals("2")) { + SharedPreferences.Editor editor = sharedPrefs.edit(); + editor.putString(DEFAULT_HOME_TAB, "0").apply(); } - - updateDrawer(); - if (mainActivity != null) - mainActivity.updateTabs(); - progressDialog.dismiss(); - //TODO: Redirect to Main only for some Activities (e.g. Topic, Board, Downloads) - //if (BaseActivity.this instanceof TopicActivity){ - Intent intent = new Intent(BaseActivity.this, MainActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); - startActivity(intent); - //} } + + updateDrawer(); + if (mainActivity != null) + mainActivity.updateTabs(); + progressDialog.dismiss(); + //TODO: Redirect to Main only for some Activities (e.g. Topic, Board, Downloads) + //if (BaseActivity.this instanceof TopicActivity){ + Intent intent = new Intent(BaseActivity.this, MainActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + startActivity(intent); + //} } private void showLogoutDialog() { @@ -545,7 +534,7 @@ public abstract class BaseActivity extends AppCompatActivity { builder.setTitle("Logout"); builder.setMessage("Are you sure that you want to logout?"); builder.setPositiveButton("Yep", (dialogInterface, i) -> { - new LogoutTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); //Avoid delays between onPreExecute() and doInBackground() + new LogoutTask(this::onLogoutTaskStarted, this::onLogoutTaskFinished).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); //Avoid delays between onPreExecute() and doInBackground() }); builder.setNegativeButton("Nope", (dialogInterface, i) -> {}); builder.create().show(); diff --git a/app/src/main/java/gr/thmmy/mthmmy/base/BaseApplication.java b/app/src/main/java/gr/thmmy/mthmmy/base/BaseApplication.java index 390faf5c..dea0808b 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/base/BaseApplication.java +++ b/app/src/main/java/gr/thmmy/mthmmy/base/BaseApplication.java @@ -128,7 +128,6 @@ public class BaseApplication extends MultiDexApplication { } private void initOkHttp(PersistentCookieJar cookieJar){ - OkHttpClient.Builder builder = new OkHttpClient.Builder() .cookieJar(cookieJar) .addInterceptor(chain -> { diff --git a/app/src/main/java/gr/thmmy/mthmmy/session/LogoutTask.java b/app/src/main/java/gr/thmmy/mthmmy/session/LogoutTask.java new file mode 100644 index 00000000..66333739 --- /dev/null +++ b/app/src/main/java/gr/thmmy/mthmmy/session/LogoutTask.java @@ -0,0 +1,86 @@ +package gr.thmmy.mthmmy.session; + +import org.jsoup.nodes.Document; +import org.jsoup.select.Elements; + +import gr.thmmy.mthmmy.base.BaseApplication; +import gr.thmmy.mthmmy.utils.Parcel; +import gr.thmmy.mthmmy.utils.networking.NetworkResultCodes; +import gr.thmmy.mthmmy.utils.networking.NetworkTask; +import gr.thmmy.mthmmy.utils.parsing.ParseException; +import okhttp3.Response; +import timber.log.Timber; + +import static gr.thmmy.mthmmy.session.SessionManager.baseLogoutLink; +import static gr.thmmy.mthmmy.session.SessionManager.indexUrl; + + +public class LogoutTask extends NetworkTask { + private String logoutLink; + + public LogoutTask(OnTaskStartedListener onTaskStartedListener, OnNetworkTaskFinishedListener onParseTaskFinishedListener) { + super(onTaskStartedListener, onParseTaskFinishedListener); + } + + @Override + protected Parcel doInBackground(String... input) { + /* Firstly we will find the logout link + Keep in mind, server changes sesc at will over time for a given session! + */ + Parcel parcel = executeInBackground(indexUrl.toString()); + if(parcel.getResultCode() == NetworkResultCodes.SUCCESSFUL) + return executeInBackground(logoutLink); // Now we will attempt to logout + else return parcel; + } + + @Override + protected Void performTask(Document document, Response response) { + try { + if(logoutLink==null) + logoutLink = extractLogoutLink(document); + else { // Just for logging purposes + Elements sessionVerificationFailed = document.select("td:containsOwn(Session " + + "verification failed. Please try logging out and back in again, and then try " + + "again.), td:containsOwn(Η επαλήθευση συνόδου απέτυχε. Παρακαλούμε κάντε " + + "αποσύνδεση, επανασύνδεση και ξαναδοκιμάστε.)"); + if(!sessionVerificationFailed.isEmpty()){ + Timber.i("Logout failed (invalid session)"); + throw new InvalidSessionException(); + } + Elements loginButton = document.select("[value=Login]"); //Attempt to find login button + if (!loginButton.isEmpty()) //If login button exists, logout was successful + Timber.i("Logout successful!"); + else + Timber.i("Logout failed"); + } + } catch (InvalidSessionException ise) { + throw ise; + } catch (Exception e) { + throw new ParseException("Parsing failed", e); + } + return null; + } + + @Override + protected void onPostExecute(Parcel voidParcel) { + super.onPostExecute(voidParcel); + //All data should always be cleared from device regardless the result of logout + BaseApplication.getInstance().getSessionManager().logoutCleanup(); + } + + @Override + protected int getResultCode(Response response, Void v) { + return NetworkResultCodes.SUCCESSFUL; + } + + private String extractLogoutLink(Document document){ + Elements logoutLink = document.select("a[href^=" + baseLogoutLink + "]"); + + if (!logoutLink.isEmpty()) { + String link = logoutLink.first().attr("href"); + if (link != null && !link.isEmpty()) + return link; + } + throw new ParseException("Parsing failed (logoutLink extraction)"); + } +} diff --git a/app/src/main/java/gr/thmmy/mthmmy/session/MarkAsReadTask.java b/app/src/main/java/gr/thmmy/mthmmy/session/MarkAsReadTask.java new file mode 100644 index 00000000..684f87ba --- /dev/null +++ b/app/src/main/java/gr/thmmy/mthmmy/session/MarkAsReadTask.java @@ -0,0 +1,65 @@ +package gr.thmmy.mthmmy.session; + +import org.jsoup.nodes.Document; +import org.jsoup.select.Elements; + +import gr.thmmy.mthmmy.utils.Parcel; +import gr.thmmy.mthmmy.utils.networking.NetworkResultCodes; +import gr.thmmy.mthmmy.utils.networking.NetworkTask; +import gr.thmmy.mthmmy.utils.parsing.ParseException; +import okhttp3.Response; + +import static gr.thmmy.mthmmy.session.SessionManager.baseMarkAllAsReadLink; +import static gr.thmmy.mthmmy.session.SessionManager.unreadUrl; + +public class MarkAsReadTask extends NetworkTask { + private String markAsReadLink; + + public MarkAsReadTask(OnTaskStartedListener onTaskStartedListener, OnNetworkTaskFinishedListener onParseTaskFinishedListener) { + super(onTaskStartedListener, onParseTaskFinishedListener); + } + + @Override + protected Parcel doInBackground(String... input) { + Parcel parcel = executeInBackground(unreadUrl.toString()); + if(parcel.getResultCode() == NetworkResultCodes.SUCCESSFUL) + return executeInBackground(markAsReadLink); + else return parcel; + } + + @Override + protected Void performTask(Document document, Response response) { + try { + Elements sessionVerificationFailed = document.select("td:containsOwn(Session " + + "verification failed. Please try logging out and back in again, and then try " + + "again.), td:containsOwn(Η επαλήθευση συνόδου απέτυχε. Παρακαλούμε κάντε " + + "αποσύνδεση, επανασύνδεση και ξαναδοκιμάστε.)"); + if(!sessionVerificationFailed.isEmpty()) + throw new InvalidSessionException(); + if(markAsReadLink==null) + markAsReadLink = extractMarkAsReadLink(document); + + } catch (InvalidSessionException ise) { + throw ise; + } catch (Exception e) { + throw new ParseException("Parsing failed", e); + } + return null; + } + + @Override + protected int getResultCode(Response response, Void v) { + return NetworkResultCodes.SUCCESSFUL; + } + + private String extractMarkAsReadLink(Document document){ + Elements markAllAsReadLink = document.select("a[href^=" + baseMarkAllAsReadLink + "]"); + + if (!markAllAsReadLink.isEmpty()) { + String link = markAllAsReadLink.first().attr("href"); + if (link != null && !link.isEmpty()) + return link; + } + throw new ParseException("Parsing failed (markAllAsReadLink extraction)"); + } +} 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 2c5cc42b..fff30acf 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java +++ b/app/src/main/java/gr/thmmy/mthmmy/session/SessionManager.java @@ -39,8 +39,8 @@ public class SessionManager { private static final HttpUrl loginUrl = HttpUrl.parse("https://www.thmmy.gr/smf/index.php?action=login2"); public static final HttpUrl unreadUrl = HttpUrl.parse("https://www.thmmy.gr/smf/index.php?action=unread;all;start=0;theme=4"); public static final HttpUrl shoutboxUrl = HttpUrl.parse("https://www.thmmy.gr/smf/index.php?action=tpmod;sa=shoutbox;theme=4"); - private static final String baseLogoutLink = "https://www.thmmy.gr/smf/index.php?action=logout;sesc="; - private static final String baseMarkAllAsReadLink = "https://www.thmmy.gr/smf/index.php?action=markasread;sa=all;sesc="; + static final String baseLogoutLink = "https://www.thmmy.gr/smf/index.php?action=logout;sesc="; + static final String baseMarkAllAsReadLink = "https://www.thmmy.gr/smf/index.php?action=markasread;sa=all;sesc="; private static final String guestName = "Guest"; //Response Codes - make sure they do not overlap with NetworkResultCodes, just in case @@ -66,9 +66,6 @@ public class SessionManager { private static final String USER_ID = "UserID"; private static final String AVATAR_LINK = "AvatarLink"; private static final String HAS_AVATAR = "HasAvatar"; - private static final String SESC = "Sesc"; - private static final String LOGOUT_LINK = "LogoutLink"; - private static final String MARK_ALL_AS_READ_LINK = "MarkAllAsReadLink"; private static final String LOGGED_IN = "LoggedIn"; private static final String LOGIN_SCREEN_AS_DEFAULT = "LoginScreenAsDefault"; @@ -82,37 +79,29 @@ public class SessionManager { this.draftsPrefs = draftsPrefs; } - //------------------------------------AUTH BEGINS---------------------------------------------- + //------------------------------------ AUTH ---------------------------------------------- /** * Login function with two options: (username, password) or nothing (using saved cookies). * Always call it in a separate thread. */ - public int login(String... strings) { + public int login(String username, String password) { Timber.d("Logging in..."); //Build the login request for each case Request request; - if (strings.length == 2) { - clearSessionData(); - - String loginName = strings[0]; - String password = strings[1]; - - RequestBody formBody = new FormBody.Builder() - .add("user", loginName) - .add("passwrd", password) - .add("cookielength", "-1") //-1 is forever - .build(); - request = new Request.Builder() - .url(loginUrl) - .post(formBody) - .build(); - } else { - request = new Request.Builder() - .url(loginUrl) - .build(); - } + clearSessionData(); + + RequestBody formBody = new FormBody.Builder() + .add("user", username) + .add("passwrd", password) + .add("cookielength", "-1") //-1 is forever + .build(); + request = new Request.Builder() + .url(loginUrl) + .post(formBody) + .build(); + try { //Make request & handle response @@ -133,10 +122,6 @@ public class SessionManager { if (avatar != null) editor.putString(AVATAR_LINK, avatar); editor.putBoolean(HAS_AVATAR, avatar != null); - String sesc = extractSesc(document); - editor.putString(SESC, sesc); - editor.putString(LOGOUT_LINK, generateLogoutLink(sesc)); - editor.putString(MARK_ALL_AS_READ_LINK, generateMarkAllAsReadLink(sesc)); editor.apply(); return SUCCESS; @@ -179,29 +164,6 @@ public class SessionManager { } } - /** - * A function that checks the validity of the current saved session (if it exists). - * If isLoggedIn() is true, it will call login() with cookies. On failure, this can only return - * the code FAILURE. CANCELLED, CONNECTION_ERROR and EXCEPTION are simply considered a SUCCESS - * (e.g. no internet connection), at least until a more thorough handling of different - * exceptions is implemented (if considered mandatory). - * Always call it in a separate thread in a way that won't hinder performance (e.g. after - * fragments' data are retrieved). - */ - void validateSession() { - Timber.i("Validating session..."); - if (isLoggedIn()) { - Timber.i("Refreshing session..."); - int loginResult = login(); - if (loginResult != FAILURE) - return; - } else if (isLoginScreenDefault()) - return; - - setLoginScreenAsDefault(true); - clearSessionData(); - } - /** * Call this function when user explicitly chooses to continue as a guest (UI thread). */ @@ -211,41 +173,12 @@ public class SessionManager { setLoginScreenAsDefault(false); } - /** - * Logout function. Always call it in a separate thread. - */ - public int logout() { - Timber.i("Logging out..."); - try { - Request request = new Request.Builder() - .url(getLogoutLink()) - .build(); - //Make request & handle response - Response response = client.newCall(request).execute(); - Document document = Jsoup.parse(response.body().string()); - - Elements loginButton = document.select("[value=Login]"); //Attempt to find login button - if (!loginButton.isEmpty()){ //If login button exists, logout was successful - Timber.i("Logout successful!"); - return SUCCESS; - } else { - Timber.i("Logout failed."); - return FAILURE; - } - } catch (IOException e) { - Timber.w(e, "Logout IOException"); - return CONNECTION_ERROR; - } catch (Exception e) { - Timber.e(e, "Logout Exception"); - return EXCEPTION; - } finally { - //All data should always be cleared from device regardless the result of logout - clearSessionData(); - guestLogin(); - } + void logoutCleanup() { + clearSessionData(); + guestLogin(); } - public void clearSessionData() { + private void clearSessionData() { cookieJar.clear(); sessionSharedPrefs.edit().clear().apply(); //Clear session data sessionSharedPrefs.edit().putString(USERNAME, guestName).apply(); @@ -255,17 +188,7 @@ public class SessionManager { Timber.i("Session data cleared."); } - public void refreshSescFromUrl(String url){ - String sesc = extractSescFromLink(url); - if(sesc!=null){ - setSesc(sesc); - setLogoutLink(generateLogoutLink(sesc)); - setMarkAsReadLink(sesc); - } - } - //--------------------------------------AUTH ENDS----------------------------------------------- - - //---------------------------------------GETTERS------------------------------------------------ + //--------------------------------------- GETTERS ------------------------------------------------ public String getUsername() { return sessionSharedPrefs.getString(USERNAME, USERNAME); } @@ -287,24 +210,6 @@ public class SessionManager { return null; } - public String getMarkAllAsReadLink() { - String markAsReadLink = sessionSharedPrefs.getString(MARK_ALL_AS_READ_LINK, null); - if(markAsReadLink == null){ //For older versions, extract it from logout link (otherwise user would have to login again) - String sesc = extractSescFromLink(getLogoutLink()); - if(sesc!=null) { - setSesc(sesc); - markAsReadLink = generateMarkAllAsReadLink(sesc); - setMarkAsReadLink(markAsReadLink); - return markAsReadLink; - } - } - return markAsReadLink; // Warning: it can be null - } - - private String getLogoutLink() { - return sessionSharedPrefs.getString(LOGOUT_LINK, null); - } - public boolean hasAvatar() { return sessionSharedPrefs.getBoolean(HAS_AVATAR, false); } @@ -317,34 +222,10 @@ public class SessionManager { return sessionSharedPrefs.getBoolean(LOGIN_SCREEN_AS_DEFAULT, true); } - //--------------------------------------GETTERS END--------------------------------------------- - - //---------------------------------------SETTERS------------------------------------------------ - private void setSesc(String sesc){ - SharedPreferences.Editor editor = sessionSharedPrefs.edit(); - editor.putString(SESC, sesc); - editor.apply(); - } - - private void setMarkAsReadLink(String markAllAsReadLink){ - SharedPreferences.Editor editor = sessionSharedPrefs.edit(); - editor.putString(MARK_ALL_AS_READ_LINK, markAllAsReadLink); - editor.apply(); - } - - private void setLogoutLink(String logoutLink){ - SharedPreferences.Editor editor = sessionSharedPrefs.edit(); - editor.putString(LOGOUT_LINK, logoutLink); - editor.apply(); - } - - //--------------------------------------SETTERS END--------------------------------------------- - - //------------------------------------OTHER FUNCTIONS------------------------------------------- + //------------------------------------ OTHER ------------------------------------------- private boolean validateRetrievedCookies() { List cookieList = cookieJar.loadForRequest(indexUrl); - for(Cookie cookie: cookieList) - { + for(Cookie cookie: cookieList) { if(cookie.name().equals("THMMYgrC00ki3")) return true; } @@ -363,7 +244,6 @@ public class SessionManager { cookieList.add(builder.build()); cookiePersistor.clear(); cookiePersistor.saveAll(cookieList); - } private void setLoginScreenAsDefault(boolean b){ @@ -430,34 +310,4 @@ public class SessionManager { Timber.i("Extracting avatar's link failed!"); return null; } - - private String extractSesc(@NonNull Document doc) { - Elements logoutLink = doc.select("a[href^=https://www.thmmy.gr/smf/index.php?action=logout;sesc=]"); - if (!logoutLink.isEmpty()) { - String link = logoutLink.first().attr("href"); - return extractSescFromLink(link); - } - Timber.e(new ParseException("Parsing failed(extractSesc)"),"ParseException"); - return null; - } - - private String extractSescFromLink(String link){ - if (link != null){ - Pattern pattern = Pattern.compile(".+;sesc=(\\w+)"); - Matcher matcher = pattern.matcher(link); - if (matcher.find()) - return matcher.group(1); - } - Timber.e(new ParseException("Parsing failed(extractSescFromLink)"),"ParseException"); - return null; - } - - private String generateLogoutLink(String sesc){ - return baseLogoutLink + sesc; - } - - private String generateMarkAllAsReadLink(String sesc){ - return baseMarkAllAsReadLink + sesc; - } - //----------------------------------OTHER FUNCTIONS END----------------------------------------- } \ No newline at end of file diff --git a/app/src/main/java/gr/thmmy/mthmmy/session/ValidateSessionTask.java b/app/src/main/java/gr/thmmy/mthmmy/session/ValidateSessionTask.java deleted file mode 100644 index b5c1392f..00000000 --- a/app/src/main/java/gr/thmmy/mthmmy/session/ValidateSessionTask.java +++ /dev/null @@ -1,18 +0,0 @@ -package gr.thmmy.mthmmy.session; - -import android.os.AsyncTask; - -import gr.thmmy.mthmmy.base.BaseApplication; - - -public class ValidateSessionTask extends AsyncTask { - @Override - protected Void doInBackground(String... params) { - BaseApplication.getInstance().getSessionManager().validateSession(); - return null; - } - - public boolean isRunning(){ - return getStatus() == AsyncTask.Status.RUNNING; - } -} diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/networking/NetworkTask.java b/app/src/main/java/gr/thmmy/mthmmy/utils/networking/NetworkTask.java index a12d5757..0ba26dd3 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/utils/networking/NetworkTask.java +++ b/app/src/main/java/gr/thmmy/mthmmy/utils/networking/NetworkTask.java @@ -1,7 +1,8 @@ package gr.thmmy.mthmmy.utils.networking; import android.content.SharedPreferences; -import android.preference.PreferenceManager; + +import androidx.preference.PreferenceManager; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -38,7 +39,19 @@ public abstract class NetworkTask extends ExternalAsyncTask public NetworkTask() {} @Override - protected final Parcel doInBackground(String... input) { + protected Parcel doInBackground(String... input) { + return executeInBackground(input); + } + + @Override + protected void onPostExecute(Parcel tParcel) { + if (onNetworkTaskFinishedListener != null) + onNetworkTaskFinishedListener.onNetworkTaskFinished(tParcel.getResultCode(), tParcel.getData()); + else + super.onPostExecute(tParcel); + } + + protected Parcel executeInBackground(String... input) { Response response; try { response = sendRequest(BaseApplication.getInstance().getClient(), input); @@ -78,14 +91,6 @@ public abstract class NetworkTask extends ExternalAsyncTask } } - @Override - protected void onPostExecute(Parcel tParcel) { - if (onNetworkTaskFinishedListener != null) - onNetworkTaskFinishedListener.onNetworkTaskFinished(tParcel.getResultCode(), tParcel.getData()); - else - super.onPostExecute(tParcel); - } - protected Response sendRequest(OkHttpClient client, String... input) throws IOException { String url = input[0]; Request request = new Request.Builder()