checkpoint: this is the commit with the asynctask

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/globals/GlobalConfigs.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/globals/GlobalConfigs.java
index ddc1fdc..a43a691 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/globals/GlobalConfigs.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/globals/GlobalConfigs.java
@@ -205,11 +205,6 @@ public class GlobalConfigs {
                     return a.name.compareTo(b.name);
                 }
             });
-            /*
-            for (int i=0; i<organisations.size(); ++i) {
-                Log.d(TAG, "getOrg postsort org["+i+"]= id:"+organisations.get(i).id+" parent:"+organisations.get(i).parent+" name:"+organisations.get(i).name);
-            }
-            */
 
             long duration_ms = System.currentTimeMillis() - start_ms;
             Log.d("init", "Loading organisations took "+duration_ms+"ms");

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/Consortium.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/Consortium.java
index cfad5e0..a65a74e 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/Consortium.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/Consortium.java
@@ -1,7 +1,9 @@
 package org.evergreen_ils.searchCatalog;
 
-/**
+/** value class
  * Created by kenstir on 11/5/2015.
  */
 public class Consortium {
+    public String name;
+    public String library_url;
 }

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseConsortiumActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseConsortiumActivity.java
index 0537c22..29e3d5b 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseConsortiumActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseConsortiumActivity.java
@@ -1,5 +1,6 @@
 package org.evergreen_ils.views;
 
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarActivity;
@@ -19,14 +20,34 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import static org.evergreen_ils.globals.GlobalConfigs.getEvergreenConsortiums;
-
 /**
  * Created by kenstir on 2015-11-05.
  */
 public class ChooseConsortiumActivity extends ActionBarActivity {
 
     private final String TAG = ChooseConsortiumActivity.class.getSimpleName();
+    public static String consortiumsJSONUrl = "http://evergreen-ils.org/testing/libraries.json";
+    Spinner spinner;
+    Button button;
+    ArrayList<Consortium> consortiums = new ArrayList<Consortium>();
+
+    private class FetchConsortiumsTask extends AsyncTask<String, void, String> {
+        protected void doInBackground(String... params) {
+            String url = params[0];
+            String result;
+            try {
+                Log.d(TAG, "fetching "+url);
+                result = Utils.getNetPageContent(url);
+            } catch (Exception e) {
+                Log.d(TAG, "error fetching", e);
+            }
+            return result;
+        }
+
+        protected void onPostExecute(String result) {
+            Log.d(TAG, "results available: "+result);
+        }
+    }
 
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -38,22 +59,20 @@ public class ChooseConsortiumActivity extends ActionBarActivity {
         ActionBar actionBar = getSupportActionBar();
         actionBar.setSubtitle(AccountAccess.userName);
 
-        // get consortiums, populate spinner
-        Spinner spinner = (Spinner) findViewById(R.id.choose_library_spinner);
-        Button button = (Button) findViewById(R.id.choose_library_button);
-        List<Consortium> consortiums = getEvergreenConsortiums();
-        Log.d(TAG, "do something useful here");
+        spinner = (Spinner) findViewById(R.id.choose_library_spinner);
+        button = (Button) findViewById(R.id.choose_library_button);
+
+        //init asynctask here
+        FetchConsortiumsTask task = new
     }
 
     public void onButtonClick(View v) {
         int id = v.getId();
     }
 
-
-    public static ArrayList<Consortium> getEvergreenConsortiums() {
+    public void getEvergreenConsortiums() {
 
         String json = null;
-        ArrayList<Consortium> consortiums = new ArrayList<Consortium>();
 
         try {
             Log.d(TAG, "fetching " + consortiumsJSONUrl);

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/LoadingTask.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/LoadingTask.java
index 74d4420..ab4982f 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/LoadingTask.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/LoadingTask.java
@@ -40,7 +40,7 @@ import android.util.Log;
  *
  */
 public class LoadingTask {
-    private final String TAG = LoadingTask.class.getName();
+    private final String TAG = LoadingTask.class.getSimpleName();
     
     public static final String TASK_OK = "OK";
 

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/SplashActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/SplashActivity.java
index b9c2b5d..70116eb 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/SplashActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/SplashActivity.java
@@ -20,11 +20,9 @@
 package org.evergreen_ils.views.splashscreen;
 
 import android.content.SharedPreferences;
-import android.os.Build;
 import org.evergreen_ils.R;
 import org.evergreen_ils.globals.GlobalConfigs;
-import org.evergreen_ils.searchCatalog.SearchCatalogListView;
-import org.evergreen_ils.views.ApplicationPreferences;
+import org.evergreen_ils.views.ChooseConsortiumActivity;
 import org.evergreen_ils.views.MainActivity;
 import org.evergreen_ils.views.splashscreen.LoadingTask.LoadingTaskListener;
 
@@ -41,7 +39,6 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import org.evergreen_ils.auth.Const;
 
 public class SplashActivity extends Activity implements LoadingTaskListener {
 
@@ -95,9 +92,9 @@ public class SplashActivity extends Activity implements LoadingTaskListener {
             library_url = prefs.getString("library_url", "");
         }
         if (library_url.isEmpty()) {
-            Intent intent = new Intent(this, ChooseLibraryActivity.class);
-            //intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-            startActivity(intent);
+            Intent i = new Intent(this, ChooseConsortiumActivity.class);
+            i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            startActivity(i);
             finish();
         }
         GlobalConfigs.httpAddress = library_url;

diff --git a/Open-ILS/src/Android/eg_app/AndroidManifest.xml b/Open-ILS/src/Android/eg_app/AndroidManifest.xml
index 8db59c7..157b16f 100644 (file)
--- a/Open-ILS/src/Android/eg_app/AndroidManifest.xml
+++ b/Open-ILS/src/Android/eg_app/AndroidManifest.xml
@@ -28,6 +28,10 @@
         <activity
                 android:name="org.evergreen_ils.views.splashscreen.SplashActivity"
                 android:theme="@android:style/Theme.NoTitleBar">
+        </activity>
+        <activity
+                android:name="org.evergreen_ils.views.ChooseConsortiumActivity"
+                android:label="@string/choose_library_message">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />