Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove MmsSmsColumns.

Browse Source 
All the columns got moved to MessageTable.
I kept the types though and renamed the class to MessageTypes because
it's a lot of boring domain-specific code.
This commit is contained in:
Greyson Parrelli
2022-12-30 15:56:47 -05:00
parent 3708cc5583
commit f149c0adb9
32 changed files with 883 additions and 989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/service/SmsDeliveryListener.java
View File

@@ -6,7 +6,7 @@ import android.content.Intent;
import android.telephony.SmsMessage;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.database.MmsSmsColumns;
import org.thoughtcrime.securesms.database.MessageTable;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.JobManager;
import org.thoughtcrime.securesms.jobs.SmsSentJob;
@@ -55,9 +55,9 @@ public class SmsDeliveryListener extends BroadcastReceiver {
// Note: https://stackoverflow.com/a/33240109
if ("3gpp2".equals(intent.getStringExtra("format"))) {
Log.w(TAG, "Correcting for CDMA delivery receipt...");
if (status >> 24 <= 0) status = MmsSmsColumns.Status.STATUS_COMPLETE;
else if (status >> 24 == 2) status = MmsSmsColumns.Status.STATUS_PENDING;
else if (status >> 24 == 3) status = MmsSmsColumns.Status.STATUS_FAILED;
if (status >> 24 <= 0) status = MessageTable.Status.STATUS_COMPLETE;
else if (status >> 24 == 2) status = MessageTable.Status.STATUS_PENDING;
else if (status >> 24 == 3) status = MessageTable.Status.STATUS_FAILED;
}
jobManager.add(new SmsSentJob(messageId, isMultipart, DELIVERED_SMS_ACTION, status, runAttempt));