From 2a4fe8d2e1c67de138283dab2081f3eef0299d21 Mon Sep 17 00:00:00 2001
From: Caesar2011 <mail@sebse.de>
Date: Wed, 6 Jun 2018 16:57:01 +0200
Subject: [PATCH] Fixed Login and Logger improved

---
 .../fuplanner/services/KVV/KVVLogin.java      |  3 +--
 .../sebse/fuplanner/tools/logging/Logger.java | 20 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVLogin.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVLogin.java
index b481597..86a531f 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVLogin.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVLogin.java
@@ -22,7 +22,6 @@ class KVVLogin extends HTTPService {
     }
 
     public void login(final String username, final String password, final NetworkCallback<LoginToken> callback, final NetworkErrorCallback error) {
-        Log.d("KVVMaster0", username+" - "+password);
         startKVVSession(success -> {
             final String kvvJSESSIONID = success.get("JSESSIONID");
             getSAMLRequest(kvvJSESSIONID, success1 -> startIdentSession(success1.get("Location"), success11 -> {
@@ -179,7 +178,7 @@ class KVVLogin extends HTTPService {
             }
             object.put("RelayState", "ss:mem:"+matcher.group(1));
 
-            pattern = Pattern.compile("([0-9a-zA-Z+]+==)");
+            pattern = Pattern.compile("name=\"SAMLResponse\" value=\"([0-9a-zA-Z+]+=*)");
             matcher = pattern.matcher(response.getParsed());
             if (!matcher.find()) {
                 errorCallback.onError(new NetworkError(100141, -1, "Error on getting SAML response!"));
diff --git a/app/src/main/java/de/sebse/fuplanner/tools/logging/Logger.java b/app/src/main/java/de/sebse/fuplanner/tools/logging/Logger.java
index e1361e4..e60696a 100644
--- a/app/src/main/java/de/sebse/fuplanner/tools/logging/Logger.java
+++ b/app/src/main/java/de/sebse/fuplanner/tools/logging/Logger.java
@@ -10,13 +10,31 @@ public class Logger {
     }
 
     public void d(Object... msg) {
-        Log.d(tag, concat(msg));
+        ld(concat(msg));
+    }
+
+    private void ld(String content) {
+        if (content.length() > 4000) {
+            Log.d(tag, content.substring(0, 4000));
+            ld(content.substring(4000));
+        } else {
+            Log.d(tag, content);
+        }
     }
 
     public void e(Object... msg) {
         Log.e(tag, concat(msg));
     }
 
+    private void le(String content) {
+        if (content.length() > 4000) {
+            Log.e(tag, content.substring(0, 4000));
+            ld(content.substring(4000));
+        } else {
+            Log.e(tag, content);
+        }
+    }
+
     private String concat(Object[] msg) {
         StringBuilder string = new StringBuilder();
         for (Object arg: msg)