From: kenstir Date: Sat, 7 Nov 2015 03:33:48 +0000 (-0500) Subject: Seems like startactivity and pref storage is working, but now X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=fb27bc2a7705e63ead49107bbde892ba5c18abf6;p=working%2FEvergreen.git Seems like startactivity and pref storage is working, but now AuthenticatorActivity is getting the url from the wrong place. --- diff --git a/Open-ILS/src/Android/core/res/values/ou.xml b/Open-ILS/src/Android/core/res/values/ou.xml index a722551ed2..3a3d9a987e 100644 --- a/Open-ILS/src/Android/core/res/values/ou.xml +++ b/Open-ILS/src/Android/core/res/values/ou.xml @@ -7,5 +7,5 @@ org.evergreen_ils Evergreen Library Evergreen Library - https://demo.evergreencatalog.com + diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseLibraryActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseLibraryActivity.java index d32e417de0..64ad929b4b 100644 --- a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseLibraryActivity.java +++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseLibraryActivity.java @@ -1,8 +1,10 @@ package org.evergreen_ils.views; import android.content.Context; +import android.content.SharedPreferences; import android.os.AsyncTask; import android.os.Bundle; +import android.preference.PreferenceManager; import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBarActivity; import android.util.Log; @@ -24,6 +26,7 @@ import java.util.*; */ public class ChooseLibraryActivity extends ActionBarActivity { + public final static int CHOOSE_LIBRARY_REQUEST = 0; private final String TAG = ChooseLibraryActivity.class.getSimpleName(); public static String consortiumsJSONUrl = "http://evergreen-ils.org/testing/libraries.json"; Context context; @@ -52,8 +55,6 @@ public class ChooseLibraryActivity extends ActionBarActivity { for (Library library : libraries) { l.add(library.name); } - //ArrayAdapter adapter = CompatSpinnerAdapter.CreateCompatSpinnerAdapter(context, l); - //ArrayAdapter adapter = new ArrayAdapter(context, android.R.layout.simple_spinner_item, l); ArrayAdapter adapter = new ArrayAdapter(context, android.R.layout.simple_spinner_dropdown_item, l); consortiumSpinner.setAdapter(adapter); } @@ -74,7 +75,6 @@ public class ChooseLibraryActivity extends ActionBarActivity { @Override public void onItemSelected(AdapterView parent, View view, int position, long id) { library_url = libraries.get(position).library_url; - Log.d(TAG, "selected library_url "+ library_url); } @Override @@ -84,7 +84,14 @@ public class ChooseLibraryActivity extends ActionBarActivity { button.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Log.d(TAG, "clicked! library_url="+ library_url); + if (library_url != null) { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); + SharedPreferences.Editor editor = prefs.edit(); + editor.putString("library_url", library_url); + editor.commit(); + setResult(RESULT_OK); + finish(); + } } }); @@ -92,10 +99,6 @@ public class ChooseLibraryActivity extends ActionBarActivity { task.execute(consortiumsJSONUrl); } - public void onButtonClick(View v) { - int id = v.getId(); - } - public List parseEvergreenConsortiums(String json) { List libraries = new ArrayList(); if (json != null) { 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 13cb8f3656..3626f5aa31 100644 --- 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 @@ -42,6 +42,7 @@ import android.widget.TextView; public class SplashActivity extends Activity implements LoadingTaskListener { + public final static int REQUEST_SELECT_LIBRARY = 0; private static String TAG = SplashActivity.class.getSimpleName(); private TextView mProgressText; private Context mContext; @@ -52,36 +53,36 @@ public class SplashActivity extends Activity implements LoadingTaskListener { private LoadingTask mTask; private static boolean mInitialized; - public static boolean isAppInitialized() - { + public static boolean isAppInitialized() { return mInitialized; } - /** android may choose to initialize the app at a non-MAIN activity if the + /** + * android may choose to initialize the app at a non-MAIN activity if the * app crashed or for other reasons. In these cases we want to force sane * initialization via the SplashActivity. - * + *

* used in all activity class's onCreate() like so: * * if (!SplashActivity.isInitialized) { - * SplashActivity.restartApp(this); - * return; + * SplashActivity.restartApp(this); + * return; * } * - * + * * @param a */ - public static void restartApp(Activity a) - { - Log.d(TAG, "restartApp> Restarting SplashActivity"); - final Intent i = new Intent(a, SplashActivity.class); - i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); - a.startActivity(i); - a.finish(); - } + public static void restartApp(Activity a) { + Log.d(TAG, "restartApp> Restarting SplashActivity"); + final Intent i = new Intent(a, SplashActivity.class); + i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + a.startActivity(i); + a.finish(); + } @Override public void onCreate(Bundle savedInstanceState) { + Log.d(TAG, "kcxxx: oncreate: splash"); super.onCreate(savedInstanceState); // make sure default values are set up for preferences @@ -93,10 +94,12 @@ public class SplashActivity extends Activity implements LoadingTaskListener { } if (library_url.isEmpty()) { Intent i = new Intent(this, ChooseLibraryActivity.class); - i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); - startActivity(i); - finish(); + //i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + Log.d(TAG, "kcxxx: oncreate: startactivity chooselibrary"); + startActivityForResult(i, REQUEST_SELECT_LIBRARY); + return; } + Log.d(TAG, "kcxxx: oncreate: afterloop"); GlobalConfigs.httpAddress = library_url; this.mContext = this; @@ -116,26 +119,27 @@ public class SplashActivity extends Activity implements LoadingTaskListener { startTask(); } - + protected void startTask() { - Log.d(TAG, "startTask> task="+mTask); + Log.d(TAG, "startTask> task=" + mTask); if (mTask != null) return; mTask = new LoadingTask(this, this); mTask.execute(); } - + @Override protected void onStop() { super.onStop(); - if(mAlertDialog != null) { + if (mAlertDialog != null) { mAlertDialog.dismiss(); } } - + @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { - Log.d(TAG, "onActivityResult> "+requestCode+" "+resultCode); + Log.d(TAG, "kcxxx: onactivityresult: " + requestCode + " " + resultCode); + Log.d(TAG, "onActivityResult> " + requestCode + " " + resultCode); } private void startApp() { @@ -153,13 +157,13 @@ public class SplashActivity extends Activity implements LoadingTaskListener { @Override public void onProgressUpdate(String value) { - Log.d(TAG, "onProgressUpdate> "+value); + Log.d(TAG, "onProgressUpdate> " + value); mProgressText.setText(value); } @Override public void onPostExecute(String result) { - Log.d(TAG, "onPostExecute> "+result); + Log.d(TAG, "onPostExecute> " + result); mTask = null; Log.d(TAG, "progressbar...gone"); mProgressBar.setVisibility(View.GONE); @@ -172,10 +176,10 @@ public class SplashActivity extends Activity implements LoadingTaskListener { extra_text = "...Failed:\n" + result; else extra_text = "...Cancelled"; - Log.d(TAG, "progresstext += "+extra_text); + Log.d(TAG, "progresstext += " + extra_text); mProgressText.setText(mProgressText.getText() + extra_text); Log.d(TAG, "retrybutton...visible"); mRetryButton.setVisibility(View.VISIBLE); } } -} +} \ No newline at end of file diff --git a/Open-ILS/src/Android/eg_app/AndroidManifest.xml b/Open-ILS/src/Android/eg_app/AndroidManifest.xml index 887d0a6d07..007dbe3795 100644 --- a/Open-ILS/src/Android/eg_app/AndroidManifest.xml +++ b/Open-ILS/src/Android/eg_app/AndroidManifest.xml @@ -28,15 +28,15 @@ - - + +