phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify source for virtual URIs

Browse Source
This commit is contained in:
fkloft 2014-01-05 16:38:48 +01:00
parent b1bed90997
commit 1f47ca87dd
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mobile/src/com/cradle/iitc_mobile/Log.java
View File

@ -7,10 +7,13 @@ import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public final class Log { public final class Log {
private static final HashMap<ConsoleMessage.MessageLevel, Integer> CONSOLE_MAPPING; private static final HashMap<ConsoleMessage.MessageLevel, Integer> CONSOLE_MAPPING;
private static final List<Receiver> RECEIVERS = new LinkedList<Log.Receiver>(); private static final List<Receiver> RECEIVERS = new LinkedList<Log.Receiver>();
private static final Pattern URL_PATTERN;
public static final String CONSOLE_TAG = "iitcm-console"; public static final String CONSOLE_TAG = "iitcm-console";
public static final String DEFAULT_TAG = "iitcm"; public static final String DEFAULT_TAG = "iitcm";
@ -29,6 +32,9 @@ public final class Log {
CONSOLE_MAPPING.put(MessageLevel.WARNING, android.util.Log.WARN); CONSOLE_MAPPING.put(MessageLevel.WARNING, android.util.Log.WARN);
CONSOLE_MAPPING.put(MessageLevel.ERROR, android.util.Log.ERROR); CONSOLE_MAPPING.put(MessageLevel.ERROR, android.util.Log.ERROR);
CONSOLE_MAPPING.put(MessageLevel.DEBUG, android.util.Log.DEBUG); CONSOLE_MAPPING.put(MessageLevel.DEBUG, android.util.Log.DEBUG);
URL_PATTERN = Pattern.compile("^https?://([a-z.]+)" + Pattern.quote(IITC_FileManager.DOMAIN) + "/(.*)$",
Pattern.CASE_INSENSITIVE);
}; };
private static synchronized void log(int priority, String tag, String msg, Throwable tr) { private static synchronized void log(int priority, String tag, String msg, Throwable tr) {
@ -120,6 +126,11 @@ public final class Log {
public static boolean log(ConsoleMessage message) { public static boolean log(ConsoleMessage message) {
String msg = message.sourceId(); String msg = message.sourceId();
Matcher matcher = URL_PATTERN.matcher(msg);
if (matcher.matches()) {
msg = "<" + matcher.group(1) + "/" + matcher.group(2) + ">";
}
if ("".equals(msg)) msg = "<no source>"; if ("".equals(msg)) msg = "<no source>";
msg += ":" + message.lineNumber() + ": " + message.message(); msg += ":" + message.lineNumber() + ": " + message.message();