From 151a8c16e63aefdd32c035c822bf3393dccd42d3 Mon Sep 17 00:00:00 2001 From: Juan Miguel Boyero Corral Date: Tue, 22 Nov 2011 22:05:15 +0000 Subject: [PATCH] User logged flag visibility changed git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@67 5bc14d19-1e4b-4ba2-aa50-860af135f48c --- SWADroid/src/es/ugr/swad/swadroid/Global.java | 48 ++++++++++++------- .../src/es/ugr/swad/swadroid/Preferences.java | 11 ++--- .../src/es/ugr/swad/swadroid/SWADMain.java | 2 +- .../es/ugr/swad/swadroid/modules/Login.java | 3 +- .../es/ugr/swad/swadroid/modules/Module.java | 4 +- 5 files changed, 41 insertions(+), 27 deletions(-) diff --git a/SWADroid/src/es/ugr/swad/swadroid/Global.java b/SWADroid/src/es/ugr/swad/swadroid/Global.java index 42617eb7..5b7c015a 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/Global.java +++ b/SWADroid/src/es/ugr/swad/swadroid/Global.java @@ -29,6 +29,23 @@ public class Global { */ public static final int LOGIN_REQUEST_CODE = 1; /** + * User logged flag + */ + private static boolean logged; + /** + * Enum type defining allowed user types + */ + public static enum UserType { + ALL, + ADMIN, + STUDENT, + TEACHER + } + /** + * Class Module's tag name for Logcat + */ + public static final String MODULE_TAG = "Module"; + /* * Table name for courses */ public static final String DB_TABLE_COURSES = "courses"; @@ -88,21 +105,18 @@ public class Global { * Table name for for relationship between test's questions and tags */ public static final String DB_TABLE_TEST_QUESTIONS_TAGS = "tst_questions_tags"; - /* - * User logged flag - */ - public static boolean logged; - /** - * Enum type defining allowed user types - */ - public static enum UserType { - ALL, - ADMIN, - STUDENT, - TEACHER - } - /** - * Class Module's tag name for Logcat - */ - public static final String MODULE_TAG = "Module"; + /** + * Checks if user is already logged on SWAD + * @return User logged flag + */ + public static boolean isLogged() { + return logged; + } + /** + * Sets user logged flag + * @param logged User logged flag + */ + public static void setLogged(boolean logged) { + Global.logged = logged; + } } diff --git a/SWADroid/src/es/ugr/swad/swadroid/Preferences.java b/SWADroid/src/es/ugr/swad/swadroid/Preferences.java index a3c6f6a6..d02e0778 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/Preferences.java +++ b/SWADroid/src/es/ugr/swad/swadroid/Preferences.java @@ -19,7 +19,6 @@ package es.ugr.swad.swadroid; -import android.app.Activity; import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; @@ -104,9 +103,9 @@ public class Preferences extends PreferenceActivity { super.onCreate(savedInstanceState); addPreferencesFromResource(R.xml.preferences); //Get the custom preference - Preference savePref = (Preference) findPreference("savePref"); - Preference userIDPref = (Preference) findPreference("userIDPref"); - Preference userPasswordPref = (Preference) findPreference("userPasswordPref"); + Preference savePref = findPreference("savePref"); + Preference userIDPref = findPreference("userIDPref"); + Preference userPasswordPref = findPreference("userPasswordPref"); userIDPref.setOnPreferenceClickListener(new OnPreferenceClickListener() { /** @@ -146,12 +145,12 @@ public class Preferences extends PreferenceActivity { R.string.saveMsg_preferences, Toast.LENGTH_LONG).show(); SharedPreferences saveSharedPreference = getSharedPreferences( - "SWADroidSharedPrefs", Activity.MODE_PRIVATE); + "SWADroidSharedPrefs", Context.MODE_PRIVATE); SharedPreferences.Editor editor = saveSharedPreference.edit(); //If user ID or password have changed, logout automatically to force a new login if(!userID.equals(oldUserID) || !userPassword.equals(oldUserPassword)) { - Global.logged = false; + Global.setLogged(false); } editor.putString("userIDPref", userID); diff --git a/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java b/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java index 139f6f76..44be4d6a 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java +++ b/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java @@ -121,7 +121,7 @@ public class SWADMain extends Activity { switch(requestCode) { case Global.LOGIN_REQUEST_CODE: - Global.logged = true; + Global.setLogged(true); break; } } diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/Login.java b/SWADroid/src/es/ugr/swad/swadroid/modules/Login.java index ad9c351e..9ab07e8c 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/Login.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/Login.java @@ -128,7 +128,8 @@ public class Login extends Module { * @param urls Background thread parameters. * @return Nothing. */ - protected Void doInBackground(String... urls) { + @Override + protected Void doInBackground(String... urls) { try { //Sends webservice request requestService(); diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/Module.java b/SWADroid/src/es/ugr/swad/swadroid/modules/Module.java index aabc8d78..dfd9e733 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/Module.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/Module.java @@ -196,7 +196,7 @@ public class Module extends Activity { prefs.getPreferences(getBaseContext()); //If not logged and this is not the Login module, launch login - if(!Global.logged && !(this instanceof Login)) { + if(!Global.isLogged() && !(this instanceof Login)) { Intent loginActivity = new Intent(getBaseContext(), Login.class); startActivityForResult(loginActivity, Global.LOGIN_REQUEST_CODE); @@ -216,7 +216,7 @@ public class Module extends Activity { switch(requestCode) { case Global.LOGIN_REQUEST_CODE: - Global.logged = true; + Global.setLogged(true); break; } }