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

4 files changed, 13 insertions, 13 deletions

diff --git a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
index 5a47bb3c..d5271903 100644
--- a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
@@ -23,7 +23,7 @@ import java.util.TreeMap;
 import java.util.regex.Pattern;
 
 import android.os.Bundle;
-import android.util.Log;
+import de.thedevstack.conversationsplus.utils.Logging;
 
 public class DNSHelper {
 
@@ -55,7 +55,7 @@ public class DNSHelper {
 		Bundle bundle = new Bundle();
 		try {
 			String qname = "_xmpp-client._tcp." + host;
-			Log.d(Config.LOGTAG, "using dns server: " + dnsServer.getHostAddress() + " to look up " + host);
+			Logging.d(Config.LOGTAG, "using dns server: " + dnsServer.getHostAddress() + " to look up " + host);
 			DNSMessage message = client.query(qname, TYPE.SRV, CLASS.IN, dnsServer.getHostAddress());
 
 			TreeMap<Integer, ArrayList<SRV>> priorities = new TreeMap<>();
diff --git a/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java b/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java
index f04cf97b..20b374c8 100644
--- a/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java
@@ -26,7 +26,7 @@ import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.preference.PreferenceManager;
 import android.text.format.DateUtils;
-import android.util.Log;
+import de.thedevstack.conversationsplus.utils.Logging;
 
 public class ExceptionHelper {
 	public static void init(Context context) {
@@ -87,13 +87,13 @@ public class ExceptionHelper {
 						@Override
 						public void onClick(DialogInterface dialog, int which) {
 
-							Log.d(Config.LOGTAG, "using account="
+							Logging.d(Config.LOGTAG, "using account="
 									+ finalAccount.getJid().toBareJid()
 									+ " to send in stack trace");
                             Conversation conversation = null;
                             try {
                                 conversation = service.findOrCreateConversation(finalAccount,
-                                        Jid.fromString("bugs@siacs.eu"), false);
+                                        Jid.fromString(context.getString(R.string.cplus_bugreport_jabberid)), false);
                             } catch (final InvalidJidException ignored) {
                             }
                             Message message = new Message(conversation, report
diff --git a/src/main/java/eu/siacs/conversations/utils/ExifHelper.java b/src/main/java/eu/siacs/conversations/utils/ExifHelper.java
index ceda7293..9e987cc5 100644
--- a/src/main/java/eu/siacs/conversations/utils/ExifHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/ExifHelper.java
@@ -16,7 +16,7 @@
 
 package eu.siacs.conversations.utils;
 
-import android.util.Log;
+import de.thedevstack.conversationsplus.utils.Logging;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -56,7 +56,7 @@ public class ExifHelper {
             }
             length = pack(buf, 0, 2, false);
             if (length < 2) {
-                Log.e(TAG, "Invalid length");
+                Logging.e(TAG, "Invalid length");
                 return 0;
             }
             length -= 2;
@@ -91,7 +91,7 @@ public class ExifHelper {
             // Identify the byte order.
             int tag = pack(jpeg, offset, 4, false);
             if (tag != 0x49492A00 && tag != 0x4D4D002A) {
-                Log.e(TAG, "Invalid byte order");
+                Logging.e(TAG, "Invalid byte order");
                 return 0;
             }
             boolean littleEndian = (tag == 0x49492A00);
@@ -99,7 +99,7 @@ public class ExifHelper {
             // Get the offset and check if it is reasonable.
             int count = pack(jpeg, offset + 4, 4, littleEndian) + 2;
             if (count < 10 || count > length) {
-                Log.e(TAG, "Invalid offset");
+                Logging.e(TAG, "Invalid offset");
                 return 0;
             }
             offset += count;
@@ -123,7 +123,7 @@ public class ExifHelper {
                         case 8:
                             return 270;
                     }
-                    Log.i(TAG, "Unsupported orientation");
+                    Logging.i(TAG, "Unsupported orientation");
                     return 0;
                 }
                 offset += 12;
@@ -131,7 +131,7 @@ public class ExifHelper {
             }
         }
 
-        Log.i(TAG, "Orientation not found");
+        Logging.i(TAG, "Orientation not found");
         return 0;
     }
 
diff --git a/src/main/java/eu/siacs/conversations/utils/PRNGFixes.java b/src/main/java/eu/siacs/conversations/utils/PRNGFixes.java
index 8fe67234..741afb35 100644
--- a/src/main/java/eu/siacs/conversations/utils/PRNGFixes.java
+++ b/src/main/java/eu/siacs/conversations/utils/PRNGFixes.java
@@ -2,7 +2,7 @@ package eu.siacs.conversations.utils;
 
 import android.os.Build;
 import android.os.Process;
-import android.util.Log;
+import de.thedevstack.conversationsplus.utils.Logging;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
@@ -209,7 +209,7 @@ public final class PRNGFixes {
 			} catch (IOException e) {
 				// On a small fraction of devices /dev/urandom is not writable.
 				// Log and ignore.
-				Log.w(PRNGFixes.class.getSimpleName(),
+				Logging.w(PRNGFixes.class.getSimpleName(),
 						"Failed to mix seed into " + URANDOM_FILE);
 			} finally {
 				mSeeded = true;