Refactoring package structure.

Part of #963.

src/main/java/de/dennisguse/opentracks/content/provider/ContentProviderUtils.java

@@ -52,7 +52,6 @@ import de.dennisguse.opentracks.content.data.TracksColumns;
 import de.dennisguse.opentracks.stats.SensorStatistics;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.FileUtils;
-import de.dennisguse.opentracks.util.UUIDUtils;
 
 /**
  * {@link ContentProviderUtils} implementation.

src/main/java/de/dennisguse/opentracks/content/provider/CustomSQLiteOpenHelper.java

@@ -19,7 +19,6 @@ import de.dennisguse.opentracks.content.data.MarkerColumns;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.content.data.TrackPointsColumns;
 import de.dennisguse.opentracks.content.data.TracksColumns;
-import de.dennisguse.opentracks.util.UUIDUtils;
 
 /**
  * Database helper for creating and upgrading the database.

src/main/java/de/dennisguse/opentracks/content/provider/UUIDUtils.java

@@ -0,0 +1,38 @@
+package de.dennisguse.opentracks.content.provider;
+
+import androidx.annotation.NonNull;
+
+import java.nio.ByteBuffer;
+import java.util.UUID;
+
+public class UUIDUtils {
+
+    public static UUID fromBytes(byte[] bytes) {
+        ByteBuffer byteBuffer = ByteBuffer.wrap(bytes);
+        long mostSignificant = byteBuffer.getLong();
+        long lestSignificant = byteBuffer.getLong();
+        return new UUID(mostSignificant, lestSignificant);
+    }
+
+    public static byte[] toBytes(@NonNull UUID uuid) {
+        ByteBuffer byteBuffer = ByteBuffer.allocate(16);
+        byteBuffer.putLong(uuid.getMostSignificantBits());
+        byteBuffer.putLong(uuid.getLeastSignificantBits());
+        return byteBuffer.array();
+    }
+
+    private static final char[] HEX_ARRAY = "0123456789ABCDEF".toCharArray();
+
+    public static String toHex(@NonNull UUID uuid) {
+        byte[] bytes = toBytes(uuid);
+
+        char[] hexChars = new char[bytes.length * 2];
+        for (int i = 0; i < bytes.length; i++) {
+            int v = bytes[i] & 0xFF;
+
+            hexChars[i * 2] = HEX_ARRAY[v >>> 4];
+            hexChars[i * 2 + 1] = HEX_ARRAY[v & 0x0F];
+        }
+        return new String(hexChars);
+    }
+}