From: kenstir <kenstir@gmail.com>
Date: Wed, 25 Nov 2015 16:24:25 +0000 (-0500)
Subject: Removed http hack
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c263ed6ee935d6e443760951dfd1e687c132cd96;p=working%2FEvergreen.git

Removed http hack
---

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 4912d4aa4b..2058ce6811 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
@@ -340,8 +340,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
         libraries.clear();
 
         if (isDebuggable()) {
-            //Library library = new Library("https://demo.evergreencatalog.com", "evergreencatalog.com Demo", "0ut There, US  (evergreencatalog.com Demo)", null);
-            Library library = new Library(cleartextHack("https://mlnc4.mvlcstaff.org"), "MVLC Demo", "0ut There, US (MVLC Demo)", null);// SSL not working
+            Library library = new Library("https://demo.evergreencatalog.com", "evergreencatalog.com Demo", "0ut There, US  (evergreencatalog.com Demo)", null);
+            //Library library = new Library("http://mlnc4.mvlcstaff.org"), "MVLC Demo", "0ut There, US (MVLC Demo)", null);// Android does not like this cert
             libraries.add(library);
         }
 
@@ -355,7 +355,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
             }
             for (Map<String, ?> map : l) {
                 String url = (String) map.get("url");
-                url = cleartextHack(url);
                 String directory_name = (String) map.get("directory_name");
                 String short_name = (String) map.get("short_name");
                 Double latitude = (Double) map.get("latitude");
@@ -380,21 +379,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
         }
     }
 
-    private String cleartextHack(String url) {
-        // fixes SSL issue with gapines and other sites
-        if (TextUtils.equals(url, "https://gapines.org")
-            || TextUtils.equals(url, "https://mlnc4.mvlcstaff.org"))
-        {
-            try {
-                String new_url = url.replaceFirst("^https:", "http:");
-                return new_url;
-            } catch (Exception e) {
-                Log.d(TAG, "caught", e);
-            }
-        }
-        return url;
-    }
-
     public boolean isDebuggable() {
         return (0 != (getApplicationInfo().flags &= ApplicationInfo.FLAG_DEBUGGABLE));
     }