From 0fdc840fda76582e6f8ab86e4db953dd269d5258 Mon Sep 17 00:00:00 2001
From: drizea <danielrizea27@gmail.com>
Date: Sat, 9 Mar 2013 17:30:14 +0200
Subject: [PATCH] Fixed shared prefs login and MyAccount buttons

---
 Open-ILS/src/Android/AndroidManifest.xml           |  18 ++--
 .../src/Android/res/layout/activity_splash.xml     |   1 +
 .../src/Android/res/layout/dashbord_account.xml    |   4 +-
 .../src/org/evergreen/android/globals/Utils.java   |   7 +-
 .../android/views/AccountScreenDashboard.java      |   1 -
 .../views/ConfigureApplicationActivity.java        |  11 +-
 .../android/views/splashscreen/SplashActivity.java | 118 +++++++++++++++++++--
 7 files changed, 128 insertions(+), 32 deletions(-)

diff --git a/Open-ILS/src/Android/AndroidManifest.xml b/Open-ILS/src/Android/AndroidManifest.xml
index 987119c56d..c1dde694da 100644
--- a/Open-ILS/src/Android/AndroidManifest.xml
+++ b/Open-ILS/src/Android/AndroidManifest.xml
@@ -43,8 +43,7 @@
         <activity
             android:name=".views.splashscreen.SplashActivity"
             android:label="@string/app_name"
-            android:theme="@android:style/Theme.Light.NoTitleBar"
-            >
+            android:theme="@android:style/Theme.Light.NoTitleBar">
            	<intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -54,33 +53,28 @@
         <activity
             android:name=".views.MainScreenDashboard"
             android:label="@string/app_name"
-            android:theme="@android:style/Theme.Light.NoTitleBar"
-             >
+            android:theme="@android:style/Theme.Light.NoTitleBar">
         </activity>
         
         <activity android:name=".views.AccountScreenDashboard"
-            		android:theme="@android:style/Theme.Light.NoTitleBar"
-            ></activity>
+            		android:theme="@android:style/Theme.Light.NoTitleBar"></activity>
         
         <activity android:name="org.evergreen.android.views.ApplicationPreferences"></activity>
         
         <!-- First launch configuration activity -->
         <activity
-            android:name="org.evergreen.android.views.ConfigureApplicationActivity"
-            ></activity>
+            android:name="org.evergreen.android.views.ConfigureApplicationActivity"></activity>
             
         <!-- Search -->    
             
         <activity android:name=".searchCatalog.SampleUnderlinesNoFade"
-            android:label="Underlines/No Fade"
-            >
+            android:label="Underlines/No Fade">
         </activity>
 		<activity android:name=".searchCatalog.MoreCopyInformation">
 		</activity>
 		<activity
             android:name=".searchCatalog.SearchCatalogListView"
-            android:label="@string/app_name"
-            >
+            android:label="@string/app_name">
         </activity>
         <activity 
             android:name=".searchCatalog.AdvancedSearchActivity">
diff --git a/Open-ILS/src/Android/res/layout/activity_splash.xml b/Open-ILS/src/Android/res/layout/activity_splash.xml
index 46f20a4224..b5d3088d61 100644
--- a/Open-ILS/src/Android/res/layout/activity_splash.xml
+++ b/Open-ILS/src/Android/res/layout/activity_splash.xml
@@ -30,6 +30,7 @@
         <TextView 
         android:id="@+id/action_in_progress"
         android:layout_width="fill_parent"
+        android:gravity="center"
         android:layout_height="wrap_content"
         android:layout_below="@id/logo"
         android:paddingTop="10dip"
diff --git a/Open-ILS/src/Android/res/layout/dashbord_account.xml b/Open-ILS/src/Android/res/layout/dashbord_account.xml
index 5d58de1a01..97ae3e82dd 100644
--- a/Open-ILS/src/Android/res/layout/dashbord_account.xml
+++ b/Open-ILS/src/Android/res/layout/dashbord_account.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="match_parent"
+    android:layout_height="fill_parent"
     android:orientation="vertical"
     android:background="@drawable/background_grey_image"
      >
@@ -66,7 +66,7 @@
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="fill_parent"
         android:gravity="center"
         android:layout_weight="1">
         <Button android:id="@+id/account_btn_fines"
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/globals/Utils.java b/Open-ILS/src/Android/src/org/evergreen/android/globals/Utils.java
index 76e25ad3bc..07c7efa559 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/globals/Utils.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/globals/Utils.java
@@ -161,6 +161,9 @@ public class Utils {
 
         System.out.println("Network access " + networkAccessEnabled);
 
+        if (!networkAccessEnabled)
+            throw new NoNetworkAccessException();
+        
         if (networkAccessEnabled) {
             // check to see if httpAddress is avaialble using the network
             // connection
@@ -169,10 +172,6 @@ public class Utils {
             if (httpAddressAccessReachable == false)
                 throw new NoAccessToServer();
         }
-
-        if (!networkAccessEnabled)
-            throw new NoNetworkAccessException();
-
         return networkAccessEnabled;
 
     }
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/views/AccountScreenDashboard.java b/Open-ILS/src/Android/src/org/evergreen/android/views/AccountScreenDashboard.java
index 9cf7f2acd5..6fdf48dbfb 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/views/AccountScreenDashboard.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/views/AccountScreenDashboard.java
@@ -55,7 +55,6 @@ public class AccountScreenDashboard extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.dashbord_account);
-
         myAccountButton = (Button) findViewById(R.id.my_account_button);
 
         myAccountButton.setOnClickListener(new OnClickListener() {
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/views/ConfigureApplicationActivity.java b/Open-ILS/src/Android/src/org/evergreen/android/views/ConfigureApplicationActivity.java
index 58885a6ebd..1392e2c027 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/views/ConfigureApplicationActivity.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/views/ConfigureApplicationActivity.java
@@ -66,6 +66,13 @@ public class ConfigureApplicationActivity extends Activity {
         username = (EditText) findViewById(R.id.username);
         password = (EditText) findViewById(R.id.password);
 
+        
+        SharedPreferences preferences = PreferenceManager
+                .getDefaultSharedPreferences(context);
+        username.setText(preferences.getString("username", ""));
+        server_http.setText(preferences.getString("library_url", ""));  
+        password.setText(preferences.getString("password", ""));
+        
         Button connect = (Button) findViewById(R.id.connect_button);
 
         connect.setOnClickListener(new OnClickListener() {
@@ -89,7 +96,7 @@ public class ConfigureApplicationActivity extends Activity {
                         }
 
                         if (server_address == true) {
-
+                            
                             SharedPreferences preferences = PreferenceManager
                                     .getDefaultSharedPreferences(context);
                             SharedPreferences.Editor editor = preferences
@@ -97,7 +104,7 @@ public class ConfigureApplicationActivity extends Activity {
                             // store into preference
                             editor.putString("library_url", server_http
                                     .getText().toString());
-
+                            
                             editor.putString("username", username.getText()
                                     .toString());
                             editor.putString("password", password.getText()
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/views/splashscreen/SplashActivity.java b/Open-ILS/src/Android/src/org/evergreen/android/views/splashscreen/SplashActivity.java
index 006bce7af4..7b6a2930ae 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/views/splashscreen/SplashActivity.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/views/splashscreen/SplashActivity.java
@@ -30,8 +30,10 @@ import org.evergreen.android.views.ConfigureApplicationActivity;
 import org.evergreen.android.views.splashscreen.LoadingTask.LoadingTaskFinishedListener;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.Service;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.ConnectivityManager;
@@ -50,7 +52,15 @@ public class SplashActivity extends Activity implements
     private ProgressBar progressBar;
 
     private String TAG = "SplashActivity";
-
+    
+    private AlertDialog alertDialog;
+    
+    
+    private static final int ABORT = 1;
+    private static final int ABORT_SERVER_PROBLEM = 2;
+    private static final int ABORT_NETWORK_CONN_PROLEM = 3;
+    private static final int OK = 0;
+    
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -63,39 +73,125 @@ public class SplashActivity extends Activity implements
         // Find the progress bar
         progressBar = (ProgressBar) findViewById(R.id.activity_splash_progress_bar);
 
-        boolean abort = false;
-
+        int abort = OK;
         SharedPreferences prefs = PreferenceManager
                 .getDefaultSharedPreferences(context);
         GlobalConfigs.httpAddress = prefs.getString("library_url", "");
         String username = prefs.getString("username", "username");
         String password = prefs.getString("password", "pas");
         AccountAccess.setAccountInfo(username, password);
-        try {
 
+        try {
             Utils.checkNetworkStatus((ConnectivityManager) getSystemService(Service.CONNECTIVITY_SERVICE));
         } catch (NoNetworkAccessException e) {
-            abort = true;
+            abort = ABORT_NETWORK_CONN_PROLEM;
             e.printStackTrace();
         } catch (NoAccessToServer e) {
-            abort = true;
-
-            // dialog.show();
+            // you have no access to server or server down
+            abort = ABORT_SERVER_PROBLEM;
+            e.printStackTrace();
+        }
+        
+        if(!prefs.contains("library_url")) {
             Intent configureIntent = new Intent(this,
                     ConfigureApplicationActivity.class);
             startActivityForResult(configureIntent, 0);
-
         }
-
-        if (abort != true) {
+        
+        if (abort == OK) {
             // Start your loading
             new LoadingTask(progressBar, this, this, progressText, this)
                     .execute("download"); // Pass in whatever you need a url is
                                           // just an example we don't use it
                                           // in this tutorial
         }
+        else
+        {
+            
+            
+            switch(abort) {
+            
+            case ABORT_NETWORK_CONN_PROLEM : {
+                AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
+                        context);
+         
+                    // set title
+                    alertDialogBuilder.setTitle("Network problem");
+         
+                    // set dialog message
+                    alertDialogBuilder
+                        .setMessage("You do not have your network activated. Please activate it.")
+                        .setCancelable(false)
+                        .setNegativeButton("exit",new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog,int id) {
+                                // if this button is clicked, just close
+                                // the dialog box and do nothing
+                                dialog.cancel();
+                                finish();
+                            }
+                        });
+         
+                        // create alert dialog
+                        alertDialog = alertDialogBuilder.create();
+         
+                        // show it
+                        alertDialog.show();
+                
+            } break;
+            
+            case ABORT_SERVER_PROBLEM : {
+                AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
+                        context);
+         
+                    // set title
+                    alertDialogBuilder.setTitle("Evergreen server problem");
+         
+                    // set dialog message
+                    alertDialogBuilder
+                        .setMessage("Seams the server can't be found. Please configure the server address")
+                        .setCancelable(false)
+                        .setPositiveButton("Configure",new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog,int id) {
+                                // if this button is clicked, close
+                                // current activity
+                                
+                                Intent configureIntent = new Intent(context, 
+                                        ConfigureApplicationActivity.class);
+                                startActivityForResult(configureIntent, 0);
+                                
+                            }
+                          })
+                        .setNegativeButton("Cancel",new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog,int id) {
+                                // if this button is clicked, just close
+                                // the dialog box and do nothing
+                                dialog.cancel();
+                                finish();
+                            }
+                        });
+         
+                        // create alert dialog
+                        alertDialog = alertDialogBuilder.create();
+         
+                        // show it
+                        alertDialog.show();
+            } break;
+            
+            }
+
+        }
     }
 
+    
+    @Override
+    protected void onStop() {
+        // TODO Auto-generated method stub
+        super.onStop();
+        if(alertDialog != null) {
+            alertDialog.dismiss();
+        }
+    }
+    
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (resultCode) {
-- 
2.11.0