Merge pull request #298 from loki-project/photo-sending-bug

Fix Attachment Upload Retrying

src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java

@@ -52,7 +52,7 @@ public class AttachmentUploadJob extends BaseJob implements InjectableType {
     this(new Job.Parameters.Builder()
                            .addConstraint(NetworkConstraint.KEY)
                            .setLifespan(TimeUnit.DAYS.toMillis(1))
-                           .setMaxAttempts(1)
+                           .setMaxAttempts(5)
                            .build(),
          attachmentId, destination);
   }

src/org/thoughtcrime/securesms/util/ResUtil.java

@@ -22,13 +22,14 @@ import android.content.res.Resources;
 import android.content.res.Resources.Theme;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
+import android.util.TypedValue;
+
 import androidx.annotation.ArrayRes;
 import androidx.annotation.AttrRes;
 import androidx.annotation.DimenRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
-import android.util.TypedValue;
 
 import org.thoughtcrime.securesms.logging.Log;