Further homescreen activity functionality

bieridee · May 5, 2012 · a8e93df · a8e93df
1 parent 3a8d1b6
commit a8e93df
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/application/res/values/strings.xml b/application/res/values/strings.xml
@@ -46,6 +46,7 @@
     <string name="dashboardscreen_profileButtonText">Profil</string>
     <string name="dashboardscreen_consumptionButtonText">Konsum</string>
     <string name="dashboardscreen_ratingButtonText">Rating</string>
+    <string name="dashboardscreen_loggedOut">Logout erfolgreich!</string>
 
     <!-- Beer list -->
     <string name="beerlist_title">BierListe</string>

diff --git a/application/src/main/java/ch/hsr/bieridee/android/activities/HomeScreenActivity.java b/application/src/main/java/ch/hsr/bieridee/android/activities/HomeScreenActivity.java
@@ -67,14 +67,17 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
+		final Intent intent;
 		switch (item.getItemId()) {
 			case R.id_mainmenu.about:
-				final Intent intent = new Intent(this.getBaseContext(), AboutScreenActivity.class);
+				intent = new Intent(this.getBaseContext(), AboutScreenActivity.class);
 				startActivity(intent);
 				break;
 			case R.id_mainmenu.logout:
-				// TODO
-				Toast.makeText(this, "TODO logout!", Toast.LENGTH_LONG).show();
+				Auth.clearAuth();
+				Toast.makeText(this.getApplicationContext(), getString(R.string.dashboardscreen_loggedOut), Toast.LENGTH_SHORT).show();
+				intent = new Intent(this.getBaseContext(), LoginScreenActivity.class);
+				startActivity(intent);
 				break;
 		}
 		return true;

diff --git a/application/src/main/java/ch/hsr/bieridee/android/config/Auth.java b/application/src/main/java/ch/hsr/bieridee/android/config/Auth.java
@@ -92,6 +92,9 @@ public static boolean getAutologin() {
 	 */
 	public static boolean dataAvailable() {
 		SharedPreferences authStore = getSharedPreferences();
-		return authStore.contains(USERNAME_KEY) && authStore.contains(PASSWORD_KEY);
+		boolean keysAvailable = authStore.contains(USERNAME_KEY) && authStore.contains(PASSWORD_KEY);
+
+		boolean nonEmptyValues = !(getUsername().isEmpty() || getPassword().isEmpty());
+		return keysAvailable && nonEmptyValues;
 	}
 }