sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Login and Logger improved

Browse Source
This commit is contained in:
Caesar2011
2018-06-06 16:57:01 +02:00
parent 3b0eb28b1e
commit 4a34ea85e3
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/de/sebse/fuplanner/services/KVV/KVVLogin.java
View File

@@ -22,7 +22,6 @@ class KVVLogin extends HTTPService {
} }
public void login(final String username, final String password, final NetworkCallback<LoginToken> callback, final NetworkErrorCallback error) { public void login(final String username, final String password, final NetworkCallback<LoginToken> callback, final NetworkErrorCallback error) {
Log.d("KVVMaster0", username+" - "+password);
startKVVSession(success -> { startKVVSession(success -> {
final String kvvJSESSIONID = success.get("JSESSIONID"); final String kvvJSESSIONID = success.get("JSESSIONID");
getSAMLRequest(kvvJSESSIONID, success1 -> startIdentSession(success1.get("Location"), success11 -> { getSAMLRequest(kvvJSESSIONID, success1 -> startIdentSession(success1.get("Location"), success11 -> {
@@ -179,7 +178,7 @@ class KVVLogin extends HTTPService {
} }
object.put("RelayState", "ss:mem:"+matcher.group(1)); 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()); matcher = pattern.matcher(response.getParsed());
if (!matcher.find()) { if (!matcher.find()) {
errorCallback.onError(new NetworkError(100141, -1, "Error on getting SAML response!")); errorCallback.onError(new NetworkError(100141, -1, "Error on getting SAML response!"));

20
app/src/main/java/de/sebse/fuplanner/tools/logging/Logger.java
View File

@@ -10,13 +10,31 @@ public class Logger {
} }
public void d(Object... msg) { 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) { public void e(Object... msg) {
Log.e(tag, concat(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) { private String concat(Object[] msg) {
StringBuilder string = new StringBuilder(); StringBuilder string = new StringBuilder();
for (Object arg: msg) for (Object arg: msg)