From 774ac468f73327a9250f9efa70d07a0c925d5cd1 Mon Sep 17 00:00:00 2001
From: kenstir <kenstir@gmail.com>
Date: Wed, 18 Nov 2015 13:44:38 -0500
Subject: [PATCH] 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.

---
 .../core/src/org/evergreen_ils/auth/AuthenticatorActivity.java     | 4 ++--
 Open-ILS/src/Android/eg_app/.idea/compiler.xml                     | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

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 a67a0bf93c..6d84927eff 100644
--- 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 217af471a9..48555b6ad4 100644
--- 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
-- 
2.11.0