Made embedded opensrf work for the eg_app too. Also, Android Marshmallow

won't let me do SSL to mlnc4.mvlcstaff.org, even though SSL works in
Chrome on Windows.  So we'll go http.

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/AuthenticatorActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/AuthenticatorActivity.java
index a67a0bf..6d84927 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/AuthenticatorActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/AuthenticatorActivity.java
@@ -286,8 +286,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
         libraries.clear();
 
         if (isDebuggable()) {
-            //Library library = new Library("https://demo.evergreencatalog.com", "Example Consortium", "00 (evergreencatalog.com Example Consortium)");
-            Library library = new Library("https://mlnc4.mvlcstaff.org", "MVLC Demo", "00 (MVLC Demo)");
+            //Library library = new Library("https://demo.evergreencatalog.com", "Evergreencatalog.com Demo", "0ut There, US  (evergreencatalog.com Example Consortium)");
+            Library library = new Library("http://mlnc4.mvlcstaff.org", "MVLC Demo", "0ut There, US (MVLC Example Consortium)");// SSL not working
             libraries.add(library);
         }
 

diff --git a/Open-ILS/src/Android/eg_app/.idea/compiler.xml b/Open-ILS/src/Android/eg_app/.idea/compiler.xml
index 217af47..48555b6 100644 (file)
--- a/Open-ILS/src/Android/eg_app/.idea/compiler.xml
+++ b/Open-ILS/src/Android/eg_app/.idea/compiler.xml
@@ -2,6 +2,10 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
+    <excludeFromCompile>
+      <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/util/Cache.java" />
+      <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/test/TestCache.java" />
+    </excludeFromCompile>
     <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="!?*.java" />
@@ -19,5 +23,4 @@
       </profile>
     </annotationProcessing>
   </component>
-</project>
-
+</project>
\ No newline at end of file