Clean up indentation

src/org/thoughtcrime/securesms/attachments/DatabaseAttachmentAudioExtras.kt

@@ -4,7 +4,7 @@ data class DatabaseAttachmentAudioExtras(
     val attachmentId: AttachmentId,
     /** Small amount of normalized audio byte samples to visualise the content (e.g. draw waveform). */
     val visualSamples: ByteArray,
-        /** Duration of the audio track in milliseconds. May be [DURATION_UNDEFINED] when is not known. */
+    /** Duration of the audio track in milliseconds. May be [DURATION_UNDEFINED] when it is not known. */
     val durationMs: Long = DURATION_UNDEFINED) {
 
     companion object {

src/org/thoughtcrime/securesms/database/AttachmentDatabase.java

@@ -24,11 +24,12 @@ import android.graphics.Bitmap;
 import android.media.MediaMetadataRetriever;
 import android.net.Uri;
 import android.os.Build;
+import android.text.TextUtils;
+import android.util.Pair;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
-import android.text.TextUtils;
-import android.util.Pair;
 
 import com.bumptech.glide.Glide;
 
@@ -52,10 +53,10 @@ import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
 import org.thoughtcrime.securesms.util.BitmapDecodingException;
 import org.thoughtcrime.securesms.util.BitmapUtil;
+import org.thoughtcrime.securesms.util.ExternalStorageUtil;
 import org.thoughtcrime.securesms.util.JsonUtils;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.MediaUtil.ThumbnailData;
-import org.thoughtcrime.securesms.util.ExternalStorageUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.video.EncryptedMediaDataSource;
 

src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java

@@ -93,8 +93,9 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
   private static final int lokiV14_BACKUP_FILES             = 35;
   private static final int lokiV15                          = 36;
   private static final int lokiV16                          = 37;
+  private static final int lokiV17                          = 38;
 
-  private static final int    DATABASE_VERSION = lokiV16;
+  private static final int    DATABASE_VERSION = lokiV17;
   private static final String DATABASE_NAME    = "signal.db";
 
   private final Context        context;
@@ -635,9 +636,12 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
       }
 
       if (oldVersion < lokiV16) {
+        db.execSQL(LokiAPIDatabase.getCreateOpenGroupProfilePictureTableCommand());
+      }
+
+      if (oldVersion < lokiV17) {
         db.execSQL("ALTER TABLE part ADD COLUMN audio_visual_samples BLOB");
         db.execSQL("ALTER TABLE part ADD COLUMN audio_duration INTEGER");
-        db.execSQL(LokiAPIDatabase.getCreateOpenGroupProfilePictureTableCommand());
       }
 
       db.setTransactionSuccessful();

src/org/thoughtcrime/securesms/jobmanager/Data.java

@@ -7,7 +7,6 @@ import androidx.annotation.Nullable;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import org.thoughtcrime.securesms.attachments.AttachmentId;
 import org.thoughtcrime.securesms.util.ParcelableUtil;
 
 import java.util.HashMap;