Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

2 files changed, 4 insertions, 4 deletions

diff --git a/src/main/java/eu/siacs/conversations/xml/Element.java b/src/main/java/eu/siacs/conversations/xml/Element.java
index 32657c66..6875364a 100644
--- a/src/main/java/eu/siacs/conversations/xml/Element.java
+++ b/src/main/java/eu/siacs/conversations/xml/Element.java
@@ -1,6 +1,6 @@
 package eu.siacs.conversations.xml;
 
-import android.util.Log;
+import de.thedevstack.conversationsplus.utils.Logging;
 
 import java.util.ArrayList;
 import java.util.Hashtable;
@@ -124,7 +124,7 @@ public class Element {
 			try {
 				return Jid.fromString(jid);
 			} catch (final InvalidJidException e) {
-				Log.e(Config.LOGTAG, "could not parse jid " + jid);
+				Logging.e(Config.LOGTAG, "could not parse jid " + jid);
 				return null;
 			}
 		}
diff --git a/src/main/java/eu/siacs/conversations/xml/XmlReader.java b/src/main/java/eu/siacs/conversations/xml/XmlReader.java
index 52d3d46a..0c8acfcd 100644
--- a/src/main/java/eu/siacs/conversations/xml/XmlReader.java
+++ b/src/main/java/eu/siacs/conversations/xml/XmlReader.java
@@ -11,7 +11,7 @@ import eu.siacs.conversations.Config;
 
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
-import android.util.Log;
+import de.thedevstack.conversationsplus.utils.Logging;
 import android.util.Xml;
 
 public class XmlReader {
@@ -25,7 +25,7 @@ public class XmlReader {
 			this.parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES,
 					true);
 		} catch (XmlPullParserException e) {
-			Log.d(Config.LOGTAG, "error setting namespace feature on parser");
+			Logging.d(Config.LOGTAG, "error setting namespace feature on parser");
 		}
 		this.wakeLock = wakeLock;
 	}