diff options
author | steckbrief <steckbrief@chefmail.de> | 2015-12-10 20:37:34 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2015-12-10 20:37:34 +0100 |
commit | 3b1723dcf19dc6e3390df63a71df903d9cb7dd94 (patch) | |
tree | a912db2e2204645fc3138cce62bb75a8d1a9b7d3 /src/main/java/eu/siacs/conversations/xmpp/jingle | |
parent | aa6a2e1c182858e7bcc077f5220546e08df12ec1 (diff) | |
parent | a7454223008c78dcf5e0ff727bca64241f99daa1 (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to '')
4 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java index cf969dc0..731d49e4 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java @@ -12,8 +12,8 @@ import android.content.Intent; import android.net.Uri; import android.os.SystemClock; +import de.thedevstack.android.logcat.Logging; import de.thedevstack.conversationsplus.ConversationsPlusPreferences; -import de.thedevstack.conversationsplus.utils.Logging; import eu.siacs.conversations.Config; import eu.siacs.conversations.entities.Account; diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java index 3353beb1..b1146543 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java @@ -6,7 +6,9 @@ import java.util.HashMap; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import android.annotation.SuppressLint; -import de.thedevstack.conversationsplus.utils.Logging; + +import de.thedevstack.android.logcat.Logging; + import eu.siacs.conversations.Config; import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.entities.Transferable; diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java index 3b4bc4d8..b200c4e0 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java @@ -8,8 +8,8 @@ import java.security.NoSuchAlgorithmException; import java.util.Arrays; import android.util.Base64; -import de.thedevstack.conversationsplus.utils.Logging; +import de.thedevstack.android.logcat.Logging; import de.thedevstack.conversationsplus.utils.StreamUtil; import eu.siacs.conversations.Config; diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java index 29d77417..41cf4d96 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java @@ -1,7 +1,5 @@ package eu.siacs.conversations.xmpp.jingle; -import de.thedevstack.conversationsplus.utils.Logging; - import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; @@ -14,6 +12,7 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; +import de.thedevstack.android.logcat.Logging; import de.thedevstack.conversationsplus.utils.StreamUtil; import eu.siacs.conversations.Config; |