TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-18 14:07:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix Attachment Upload Retrying
This commit is contained in:
Niels Andriesse 2020-08-27 15:29:18 +10:00 committed by GitHub
commit 0234ddfd72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java
View File

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

5
src/org/thoughtcrime/securesms/util/ResUtil.java
View File

@ -22,13 +22,14 @@ import android.content.res.Resources;
import android.content.res.Resources.Theme; import android.content.res.Resources.Theme;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.util.TypedValue;
import androidx.annotation.ArrayRes; import androidx.annotation.ArrayRes;
import androidx.annotation.AttrRes; import androidx.annotation.AttrRes;
import androidx.annotation.DimenRes; import androidx.annotation.DimenRes;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.util.TypedValue;
import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.logging.Log;
@ -57,7 +58,7 @@ public class ResUtil {
int drawableRes = getDrawableRes(c, attr); int drawableRes = getDrawableRes(c, attr);
if (drawableRes == 0) { if (drawableRes == 0) {
Log.e(TAG, "Cannot find a drawable resource associated with the attribute: " + attr, Log.e(TAG, "Cannot find a drawable resource associated with the attribute: " + attr,
new Resources.NotFoundException()); new Resources.NotFoundException());
return null; return null;
} }
return ContextCompat.getDrawable(c, drawableRes); return ContextCompat.getDrawable(c, drawableRes);