aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xml/XmlReader.java
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2015-12-10 20:37:34 +0100
committersteckbrief <steckbrief@chefmail.de>2015-12-10 20:37:34 +0100
commit3b1723dcf19dc6e3390df63a71df903d9cb7dd94 (patch)
treea912db2e2204645fc3138cce62bb75a8d1a9b7d3 /src/main/java/eu/siacs/conversations/xml/XmlReader.java
parentaa6a2e1c182858e7bcc077f5220546e08df12ec1 (diff)
parenta7454223008c78dcf5e0ff727bca64241f99daa1 (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xml/XmlReader.java')
-rw-r--r--src/main/java/eu/siacs/conversations/xml/XmlReader.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/eu/siacs/conversations/xml/XmlReader.java b/src/main/java/eu/siacs/conversations/xml/XmlReader.java
index 0c8acfcd..5375d60d 100644
--- a/src/main/java/eu/siacs/conversations/xml/XmlReader.java
+++ b/src/main/java/eu/siacs/conversations/xml/XmlReader.java
@@ -1,5 +1,9 @@
package eu.siacs.conversations.xml;
+import android.os.PowerManager;
+import android.os.PowerManager.WakeLock;
+import android.util.Xml;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -7,12 +11,9 @@ import java.io.InputStreamReader;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
-import eu.siacs.conversations.Config;
+import de.thedevstack.android.logcat.Logging;
-import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
-import de.thedevstack.conversationsplus.utils.Logging;
-import android.util.Xml;
+import eu.siacs.conversations.Config;
public class XmlReader {
private XmlPullParser parser;