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

1 files changed, 6 insertions, 6 deletions

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;
     }