Merge branch 'dev' into update-geolite2

app/build.gradle

@@ -322,6 +322,7 @@ dependencies {
     implementation "com.google.protobuf:protobuf-java:$protobufVersion"
     implementation "com.fasterxml.jackson.core:jackson-databind:$jacksonDatabindVersion"
     implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
+    implementation "com.squareup.phrase:phrase:$phraseVersion"
     implementation 'app.cash.copper:copper-flow:1.0.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"

app/src/main/java/org/thoughtcrime/securesms/components/ProfilePictureView.kt

@@ -17,6 +17,7 @@ import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.GroupUtil
 import org.session.libsession.utilities.recipients.Recipient
+import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.mms.GlideRequests
@@ -24,6 +25,8 @@ import org.thoughtcrime.securesms.mms.GlideRequests
 class ProfilePictureView @JvmOverloads constructor(
     context: Context, attrs: AttributeSet? = null
 ) : RelativeLayout(context, attrs) {
+    private val TAG = "ProfilePictureView"
+
     private val binding = ViewProfilePictureBinding.inflate(LayoutInflater.from(context), this)
     private val glide: GlideRequests = GlideApp.with(this)
     var publicKey: String? = null
@@ -85,7 +88,7 @@ class ProfilePictureView @JvmOverloads constructor(
     }
 
     fun update() {
-        val publicKey = publicKey ?: return
+        val publicKey = publicKey ?: return Log.w(TAG, "Could not find public key to update profile picture")
         val additionalPublicKey = additionalPublicKey
         if (additionalPublicKey != null) {
             setProfilePictureIfNeeded(binding.doubleModeImageView1, publicKey, displayName)

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionUtilities.kt

@@ -1,15 +1,12 @@
 package org.thoughtcrime.securesms.conversation.v2.utilities
 
 import android.content.Context
-import android.graphics.Color
 import android.graphics.Typeface
 import android.text.Spannable
 import android.text.SpannableString
-import android.text.style.BackgroundColorSpan
 import android.text.style.ForegroundColorSpan
 import android.text.style.StyleSpan
 import android.util.Range
-import androidx.core.content.res.ResourcesCompat
 import network.loki.messenger.R
 import nl.komponents.kovenant.combine.Tuple2
 import org.session.libsession.messaging.contacts.Contact
@@ -22,7 +19,6 @@ import org.session.libsession.utilities.truncateIdForDisplay
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
 import org.thoughtcrime.securesms.util.RoundedBackgroundSpan
 import org.thoughtcrime.securesms.util.getAccentColor
-import org.thoughtcrime.securesms.util.toPx
 import java.util.regex.Pattern
 
 object MentionUtilities {

app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.kt

@@ -1242,38 +1242,26 @@ class MmsDatabase(context: Context, databaseHelper: SQLCipherOpenHelper) : Messa
             }
 
         private fun getNotificationMmsMessageRecord(cursor: Cursor): NotificationMmsMessageRecord {
+            // Note: Additional details such as ADDRESS_DEVICE_ID, CONTENT_LOCATION, and TRANSACTION_ID are available if required.
             val id                   = cursor.getLong(cursor.getColumnIndexOrThrow(ID))
             val dateSent             = cursor.getLong(cursor.getColumnIndexOrThrow(NORMALIZED_DATE_SENT))
-            val dateReceived = cursor.getLong(
-                cursor.getColumnIndexOrThrow(
-                    NORMALIZED_DATE_RECEIVED
-                )
-            )
+            val dateReceived         = cursor.getLong(cursor.getColumnIndexOrThrow(NORMALIZED_DATE_RECEIVED))
             val threadId             = cursor.getLong(cursor.getColumnIndexOrThrow(THREAD_ID))
             val mailbox              = cursor.getLong(cursor.getColumnIndexOrThrow(MESSAGE_BOX))
             val address              = cursor.getString(cursor.getColumnIndexOrThrow(ADDRESS))
-            val addressDeviceId = cursor.getInt(cursor.getColumnIndexOrThrow(ADDRESS_DEVICE_ID))
             val recipient            = getRecipientFor(address)
-            val contentLocation = cursor.getString(cursor.getColumnIndexOrThrow(CONTENT_LOCATION))
-            val transactionId = cursor.getString(cursor.getColumnIndexOrThrow(TRANSACTION_ID))
             val messageSize          = cursor.getLong(cursor.getColumnIndexOrThrow(MESSAGE_SIZE))
             val expiry               = cursor.getLong(cursor.getColumnIndexOrThrow(EXPIRY))
             val status               = cursor.getInt(cursor.getColumnIndexOrThrow(STATUS))
-            val deliveryReceiptCount = cursor.getInt(
-                cursor.getColumnIndexOrThrow(
-                    DELIVERY_RECEIPT_COUNT
-                )
-            )
+            val deliveryReceiptCount = cursor.getInt(cursor.getColumnIndexOrThrow(DELIVERY_RECEIPT_COUNT))
             val readReceiptCount     = if (isReadReceiptsEnabled(context)) cursor.getInt(cursor.getColumnIndexOrThrow(READ_RECEIPT_COUNT)) else 0
             val hasMention           = (cursor.getInt(cursor.getColumnIndexOrThrow(HAS_MENTION)) == 1)
-            val contentLocationBytes: ByteArray? = contentLocation?.takeUnless { it.isEmpty() }?.let(::toIsoBytes)
-            val transactionIdBytes: ByteArray? = transactionId?.takeUnless { it.isEmpty() }?.let(::toIsoBytes)
             val slideDeck            = SlideDeck(context, MmsNotificationAttachment(status, messageSize))
+
             return NotificationMmsMessageRecord(
                 id, recipient, recipient,
                 dateSent, dateReceived, deliveryReceiptCount, threadId,
-                contentLocationBytes, messageSize, expiry, status,
-                transactionIdBytes, mailbox, slideDeck,
+                messageSize, expiry, status, mailbox, slideDeck,
                 readReceiptCount, hasMention
             )
         }
@@ -1281,34 +1269,23 @@ class MmsDatabase(context: Context, databaseHelper: SQLCipherOpenHelper) : Messa
         private fun getMediaMmsMessageRecord(cursor: Cursor, getQuote: Boolean): MediaMmsMessageRecord {
             val id                   = cursor.getLong(cursor.getColumnIndexOrThrow(ID))
             val dateSent             = cursor.getLong(cursor.getColumnIndexOrThrow(NORMALIZED_DATE_SENT))
-            val dateReceived = cursor.getLong(
-                cursor.getColumnIndexOrThrow(
-                    NORMALIZED_DATE_RECEIVED
-                )
-            )
+            val dateReceived         = cursor.getLong(cursor.getColumnIndexOrThrow(NORMALIZED_DATE_RECEIVED))
             val box                  = cursor.getLong(cursor.getColumnIndexOrThrow(MESSAGE_BOX))
             val threadId             = cursor.getLong(cursor.getColumnIndexOrThrow(THREAD_ID))
             val address              = cursor.getString(cursor.getColumnIndexOrThrow(ADDRESS))
             val addressDeviceId      = cursor.getInt(cursor.getColumnIndexOrThrow(ADDRESS_DEVICE_ID))
-            val deliveryReceiptCount = cursor.getInt(
-                cursor.getColumnIndexOrThrow(
-                    DELIVERY_RECEIPT_COUNT
-                )
-            )
+            val deliveryReceiptCount = cursor.getInt(cursor.getColumnIndexOrThrow(DELIVERY_RECEIPT_COUNT))
             var readReceiptCount     = cursor.getInt(cursor.getColumnIndexOrThrow(READ_RECEIPT_COUNT))
             val body                 = cursor.getString(cursor.getColumnIndexOrThrow(BODY))
             val partCount            = cursor.getInt(cursor.getColumnIndexOrThrow(PART_COUNT))
-            val mismatchDocument = cursor.getString(
-                cursor.getColumnIndexOrThrow(
-                    MISMATCHED_IDENTITIES
-                )
-            )
+            val mismatchDocument     = cursor.getString(cursor.getColumnIndexOrThrow(MISMATCHED_IDENTITIES))
             val networkDocument      = cursor.getString(cursor.getColumnIndexOrThrow(NETWORK_FAILURE))
             val subscriptionId       = cursor.getInt(cursor.getColumnIndexOrThrow(SUBSCRIPTION_ID))
             val expiresIn            = cursor.getLong(cursor.getColumnIndexOrThrow(EXPIRES_IN))
             val expireStarted        = cursor.getLong(cursor.getColumnIndexOrThrow(EXPIRE_STARTED))
             val unidentified         = cursor.getInt(cursor.getColumnIndexOrThrow(UNIDENTIFIED)) == 1
             val hasMention           = cursor.getInt(cursor.getColumnIndexOrThrow(HAS_MENTION)) == 1
+
             if (!isReadReceiptsEnabled(context)) {
                 readReceiptCount = 0
             }

app/src/main/java/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java

@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2012 Moxie Marlinspike
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.thoughtcrime.securesms.database.model;
-
-import static java.util.Collections.emptyList;
-
-import android.content.Context;
-import android.text.SpannableString;
-
-import androidx.annotation.NonNull;
-
-import org.session.libsession.utilities.recipients.Recipient;
-import org.thoughtcrime.securesms.database.MmsDatabase;
-import org.thoughtcrime.securesms.database.SmsDatabase.Status;
-import org.thoughtcrime.securesms.mms.SlideDeck;
-
-import network.loki.messenger.R;
-
-/**
- * Represents the message record model for MMS messages that are
- * notifications (ie: they're pointers to undownloaded media).
- *
- * @author Moxie Marlinspike
- *
- */
-
-public class NotificationMmsMessageRecord extends MmsMessageRecord {
-  private final byte[] contentLocation;
-  private final long   messageSize;
-  private final long   expiry;
-  private final int    status;
-  private final byte[] transactionId;
-
-  public NotificationMmsMessageRecord(long id, Recipient conversationRecipient,
-    Recipient individualRecipient,
-    long dateSent, long dateReceived, int deliveryReceiptCount,
-    long threadId, byte[] contentLocation, long messageSize,
-    long expiry, int status, byte[] transactionId, long mailbox,
-    SlideDeck slideDeck, int readReceiptCount, boolean hasMention)
-  {
-    super(id, "", conversationRecipient, individualRecipient,
-      dateSent, dateReceived, threadId, Status.STATUS_NONE, deliveryReceiptCount, mailbox,
-            emptyList(), emptyList(),
-      0, 0, slideDeck, readReceiptCount, null, emptyList(), emptyList(), false, emptyList(), hasMention);
-
-    this.contentLocation = contentLocation;
-    this.messageSize     = messageSize;
-    this.expiry          = expiry;
-    this.status          = status;
-    this.transactionId   = transactionId;
-  }
-
-  public byte[] getTransactionId() {
-    return transactionId;
-  }
-  public int getStatus() {
-    return this.status;
-  }
-  public byte[] getContentLocation() {
-    return contentLocation;
-  }
-  public long getMessageSize() {
-    return (messageSize + 1023) / 1024;
-  }
-  public long getExpiration() {
-    return expiry * 1000;
-  }
-
-  @Override
-  public boolean isOutgoing() {
-    return false;
-  }
-
-  @Override
-  public boolean isPending() {
-    return false;
-  }
-
-  @Override
-  public boolean isMmsNotification() {
-    return true;
-  }
-
-  @Override
-  public boolean isMediaPending() {
-    return true;
-  }
-
-  @Override
-  public SpannableString getDisplayBody(@NonNull Context context) {
-    if (status == MmsDatabase.Status.DOWNLOAD_INITIALIZED) {
-      return emphasisAdded(context.getString(R.string.NotificationMmsMessageRecord_multimedia_message));
-    } else if (status == MmsDatabase.Status.DOWNLOAD_CONNECTING) {
-      return emphasisAdded(context.getString(R.string.NotificationMmsMessageRecord_downloading_mms_message));
-    } else {
-      return emphasisAdded(context.getString(R.string.NotificationMmsMessageRecord_error_downloading_mms_message));
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.kt

@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2012 Moxie Marlinspike
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms.database.model
+
+import org.session.libsession.utilities.recipients.Recipient
+import org.thoughtcrime.securesms.database.SmsDatabase
+import org.thoughtcrime.securesms.mms.SlideDeck
+
+/**
+ * Represents the message record model for MMS messages that are
+ * notifications (ie: they're pointers to undownloaded media).
+ *
+ * @author Moxie Marlinspike
+ */
+class NotificationMmsMessageRecord(
+    id: Long, conversationRecipient: Recipient?,
+    individualRecipient: Recipient?,
+    dateSent: Long,
+    dateReceived: Long,
+    deliveryReceiptCount: Int,
+    threadId: Long,
+    private val messageSize: Long,
+    private val expiry: Long,
+    val status: Int,
+    mailbox: Long,
+    slideDeck: SlideDeck?,
+    readReceiptCount: Int,
+    hasMention: Boolean
+) : MmsMessageRecord(
+    id, "", conversationRecipient, individualRecipient,
+    dateSent, dateReceived, threadId, SmsDatabase.Status.STATUS_NONE, deliveryReceiptCount, mailbox,
+    emptyList(), emptyList(),
+    0, 0, slideDeck!!, readReceiptCount, null, emptyList(), emptyList(), false, emptyList(), hasMention
+) {
+    fun getMessageSize(): Long {
+        return (messageSize + 1023) / 1024
+    }
+
+    val expiration: Long
+        get() = expiry * 1000
+
+    override fun isOutgoing(): Boolean {
+        return false
+    }
+
+    override fun isPending(): Boolean {
+        return false
+    }
+
+    override fun isMmsNotification(): Boolean {
+        return true
+    }
+
+    override fun isMediaPending(): Boolean {
+        return true
+    }
+}

app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestView.kt

@@ -34,13 +34,13 @@ class MessageRequestView : LinearLayout {
     // region Updating
     fun bind(thread: ThreadRecord, glide: GlideRequests) {
         this.thread = thread
-        val senderDisplayName = getUserDisplayName(thread.recipient)
-            ?: thread.recipient.address.toString()
+
+        val senderDisplayName = getUserDisplayName(thread.recipient) ?: thread.recipient.address.toString()
+
         binding.displayNameTextView.text = senderDisplayName
         binding.timestampTextView.text = DateUtils.getDisplayFormattedTimeSpanString(context, Locale.getDefault(), thread.date)
-        val rawSnippet = thread.getDisplayBody(context)
         val snippet = highlightMentions(
-            text = rawSnippet,
+            text = thread.getDisplayBody(context),
             formatOnly = true, // no styling here, only text formatting
             threadID = thread.threadId,
             context = context

app/src/main/java/org/thoughtcrime/securesms/mms/Slide.java

@@ -16,24 +16,23 @@
  */
 package org.thoughtcrime.securesms.mms;
 
+import static org.session.libsession.utilities.StringSubstitutionConstants.EMOJI_KEY;
+
 import android.content.Context;
 import android.content.res.Resources.Theme;
 import android.net.Uri;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
-import org.session.libsession.messaging.sending_receiving.attachments.AttachmentTransferProgress;
-import org.thoughtcrime.securesms.util.MediaUtil;
-import org.session.libsignal.utilities.guava.Optional;
-
+import com.squareup.phrase.Phrase;
+import java.security.SecureRandom;
+import network.loki.messenger.R;
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
+import org.session.libsession.messaging.sending_receiving.attachments.AttachmentTransferProgress;
 import org.session.libsession.messaging.sending_receiving.attachments.UriAttachment;
 import org.session.libsession.utilities.Util;
-
-import java.security.SecureRandom;
-
-import network.loki.messenger.R;
+import org.session.libsignal.utilities.guava.Optional;
+import org.thoughtcrime.securesms.util.MediaUtil;
 
 public abstract class Slide {
 
@@ -72,7 +71,10 @@ public abstract class Slide {
         return Optional.fromNullable("🎤 " + attachmentString);
       }
     }
-    return Optional.fromNullable(emojiForMimeType() + attachmentString);
+    String txt = Phrase.from(context, R.string.attachmentsNotification)
+            .put(EMOJI_KEY, emojiForMimeType())
+            .format().toString();
+    return Optional.fromNullable(txt);
   }
 
   private String emojiForMimeType() {
@@ -85,7 +87,7 @@ public abstract class Slide {
     } else if (MediaUtil.isFile(attachment)) {
       return "📎";
     } else {
-      return "🎡 ";
+      return "🎡"; // `isGif`
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java

@@ -24,6 +24,7 @@ import androidx.annotation.Nullable;
 import com.annimon.stream.Stream;
 
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
+import org.session.libsignal.utilities.Log;
 import org.session.libsignal.utilities.guava.Optional;
 import org.thoughtcrime.securesms.util.MediaUtil;
 
@@ -47,8 +48,7 @@ public class SlideDeck {
     if (slide != null) slides.add(slide);
   }
 
-  public SlideDeck() {
-  }
+  public SlideDeck() { }
 
   public void clear() {
     slides.clear();
@@ -65,7 +65,6 @@ public class SlideDeck {
         body = slideBody.get();
       }
     }
-
     return body;
   }
 

app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java

@@ -29,6 +29,7 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.service.notification.StatusBarNotification;
+import android.text.SpannableString;
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
@@ -145,9 +146,8 @@ public class DefaultMessageNotifier implements MessageNotifier {
   }
 
   public void notifyMessagesPending(Context context) {
-    if (!TextSecurePreferences.isNotificationsEnabled(context)) {
-      return;
-    }
+
+    if (!TextSecurePreferences.isNotificationsEnabled(context)) { return; }
 
     PendingMessageNotificationBuilder builder = new PendingMessageNotificationBuilder(context, TextSecurePreferences.getNotificationPrivacy(context));
     ServiceUtil.getNotificationManager(context).notify(PENDING_MESSAGES_ID, builder.build());
@@ -197,9 +197,7 @@ public class DefaultMessageNotifier implements MessageNotifier {
             }
           }
 
-          if (!validNotification) {
-            notifications.cancel(notification.getId());
-          }
+          if (!validNotification) { notifications.cancel(notification.getId()); }
         }
       }
     } catch (Throwable e) {
@@ -348,14 +346,19 @@ public class DefaultMessageNotifier implements MessageNotifier {
     builder.setThread(notifications.get(0).getRecipient());
     builder.setMessageCount(notificationState.getMessageCount());
 
-    // TODO: Removing highlighting mentions in the notification because this context is the libsession one which
-    // TODO: doesn't have access to the `R.attr.message_sent_text_color` and `R.attr.message_received_text_color`
-    // TODO: attributes to perform the colour lookup. Also, it makes little sense to highlight the mentions using
-    // TODO: the app theme as it may result in insufficient contrast with the notification background which will
-    // TODO: be using the SYSTEM theme.
-    builder.setPrimaryMessageBody(recipient, notifications.get(0).getIndividualRecipient(),
-                                  //MentionUtilities.highlightMentions(text == null ? "" : text, notifications.get(0).getThreadId(), context), // Removing hightlighting mentions -ACL
-                                  text == null ? "" : text,
+    CharSequence builderCS = text == null ? "" : text;
+    SpannableString ss = MentionUtilities.highlightMentions(
+            builderCS,
+            false,
+            false,
+            true,
+            bundled ? notifications.get(0).getThreadId() : 0,
+            context
+    );
+
+    builder.setPrimaryMessageBody(recipient,
+                                  notifications.get(0).getIndividualRecipient(),
+                                  ss,
                                   notifications.get(0).getSlideDeck());
 
     builder.setContentIntent(notifications.get(0).getPendingIntent(context));
@@ -505,24 +508,39 @@ public class DefaultMessageNotifier implements MessageNotifier {
           continue;
         }
       }
+
+      // If this is a message request from an unknown user..
       if (messageRequest) {
         body = SpanUtil.italic(context.getString(R.string.message_requests_notification));
+
+      // If we received some manner of notification but Session is locked..
       } else if (KeyCachingService.isLocked(context)) {
         body = SpanUtil.italic(context.getString(R.string.MessageNotifier_locked_message));
+
+      // ----- All further cases assume we know the contact and that Session isn't locked -----
+
+      // If this is a notification about a multimedia message from a contact we know about..
       } else if (record.isMms() && !((MmsMessageRecord) record).getSharedContacts().isEmpty()) {
         Contact contact = ((MmsMessageRecord) record).getSharedContacts().get(0);
         body = ContactUtil.getStringSummary(context, contact);
+
+      // If this is a notification about a multimedia message which contains no text but DOES contain a slide deck with at least one slide..
       } else if (record.isMms() && TextUtils.isEmpty(body) && !((MmsMessageRecord) record).getSlideDeck().getSlides().isEmpty()) {
         slideDeck = ((MediaMmsMessageRecord)record).getSlideDeck();
         body = SpanUtil.italic(slideDeck.getBody());
+
+      // If this is a notification about a multimedia message, but it's not ITSELF a multimedia notification AND it contains a slide deck with at least one slide..
       } else if (record.isMms() && !record.isMmsNotification() && !((MmsMessageRecord) record).getSlideDeck().getSlides().isEmpty()) {
         slideDeck = ((MediaMmsMessageRecord)record).getSlideDeck();
         String message      = slideDeck.getBody() + ": " + record.getBody();
         int    italicLength = message.length() - body.length();
         body = SpanUtil.italic(message, italicLength);
+
+      // If this is a notification about an invitation to a community..
       } else if (record.isOpenGroupInvitation()) {
         body = SpanUtil.italic(context.getString(R.string.ThreadRecord_open_group_invitation));
       }
+
       String userPublicKey = TextSecurePreferences.getLocalNumber(context);
       String blindedPublicKey = cache.get(threadId);
       if (blindedPublicKey == null) {

app/src/main/java/org/thoughtcrime/securesms/notifications/DeleteNotificationReceiver.java

@@ -1,11 +1,9 @@
 package org.thoughtcrime.securesms.notifications;
 
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
-
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent;
 

app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt

@@ -56,6 +56,7 @@ import org.thoughtcrime.securesms.showSessionDialog
 import org.thoughtcrime.securesms.util.BitmapDecodingException
 import org.thoughtcrime.securesms.util.BitmapUtil
 import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
+import org.thoughtcrime.securesms.util.NetworkUtils
 import org.thoughtcrime.securesms.util.disableClipping
 import org.thoughtcrime.securesms.util.push
 import org.thoughtcrime.securesms.util.show
@@ -179,7 +180,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
                     try {
                         val profilePictureToBeUploaded = BitmapUtil.createScaledBytes(this@SettingsActivity, AvatarSelection.getResultUri(data), ProfileMediaConstraints()).bitmap
                         Handler(Looper.getMainLooper()).post {
-                            updateProfile(true, profilePictureToBeUploaded)
+                            updateProfilePicture(profilePictureToBeUploaded)
                         }
                     } catch (e: BitmapDecodingException) {
                         e.printStackTrace()
@@ -228,56 +229,59 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
         }
     }
 
-    private fun updateProfile(
-        isUpdatingProfilePicture: Boolean,
-        profilePicture: ByteArray? = null,
-        displayName: String? = null
-    ) {
+    private fun updateDisplayName(displayName: String): Boolean {
         binding.loader.isVisible = true
 
-        if (displayName != null) {
-            TextSecurePreferences.setProfileName(this, displayName)
-            configFactory.user?.setName(displayName)
-        }
+        // We'll assume we fail & flip the flag on success
+        var updateWasSuccessful = false
 
-        // Bail if we're not updating the profile picture in any way
-        if (!isUpdatingProfilePicture) return
-
-        val encodedProfileKey = ProfileKeyUtil.generateEncodedProfileKey(this)
-
-        val uploadProfilePicturePromise: Promise<*, Exception>
-        var removingProfilePic = false
-
-        // Adding a new profile picture?
-        if (profilePicture != null) {
-            uploadProfilePicturePromise = ProfilePictureUtilities.upload(profilePicture, encodedProfileKey, this)
+        val haveNetworkConnection = NetworkUtils.haveValidNetworkConnection(this@SettingsActivity);
+        if (!haveNetworkConnection) {
+            Log.w(TAG, "Cannot update display name - no network connection.")
         } else {
-            // If not then we must be removing the existing one.
-            // Note: To get a promise that will resolve / sync correctly we overwrite the existing profile picture with
-            // a 0 byte image.
-            removingProfilePic = true
-            val emptyByteArray = ByteArray(0)
-            uploadProfilePicturePromise = ProfilePictureUtilities.upload(emptyByteArray, encodedProfileKey, this)
+            // if we have a network connection then attempt to update the display name
+            TextSecurePreferences.setProfileName(this, displayName)
+            val user = configFactory.user
+            if (user == null) {
+                Log.w(TAG, "Cannot update display name - missing user details from configFactory.")
+            } else {
+                user.setName(displayName)
+                binding.btnGroupNameDisplay.text = displayName
+                updateWasSuccessful = true
+            }
         }
 
-        // If the upload picture promise succeeded then we hit this successUi block
-        uploadProfilePicturePromise.successUi {
+        // Inform the user if we failed to update the display name
+        if (!updateWasSuccessful) {
+            Toast.makeText(this@SettingsActivity, R.string.profileErrorUpdate, Toast.LENGTH_LONG).show()
+        }
 
-            // If we successfully removed the profile picture on the network then we can clear the
-            // local data - otherwise it's weird to fail the online section but it _looks_ like it
-            // worked because we cleared the local image (also it denies them the chance to retry
-            // removal if we do it locally, and may result in them having a visible profile picture
-            // everywhere EXCEPT on their own device!).
-            if (removingProfilePic) {
+        binding.loader.isVisible = false
+        return updateWasSuccessful
+    }
+
+    // Helper method used by updateProfilePicture and removeProfilePicture to sync it online
+    private fun syncProfilePicture(profilePicture: ByteArray, onFail: () -> Unit) {
+        binding.loader.isVisible = true
+
+        // Grab the profile key and kick of the promise to update the profile picture
+        val encodedProfileKey = ProfileKeyUtil.generateEncodedProfileKey(this)
+        val updateProfilePicturePromise = ProfilePictureUtilities.upload(profilePicture, encodedProfileKey, this)
+
+        // If the online portion of the update succeeded then update the local state
+        updateProfilePicturePromise.successUi {
+
+            // When removing the profile picture the supplied ByteArray is empty so we'll clear the local data
+            if (profilePicture.isEmpty()) {
                 MessagingModuleConfiguration.shared.storage.clearUserPic()
             }
 
             val userConfig = configFactory.user
             AvatarHelper.setAvatar(this, Address.fromSerialized(TextSecurePreferences.getLocalNumber(this)!!), profilePicture)
-            TextSecurePreferences.setProfileAvatarId(this, profilePicture?.let { SecureRandom().nextInt() } ?: 0 )
+            TextSecurePreferences.setProfileAvatarId(this, profilePicture.let { SecureRandom().nextInt() } )
             ProfileKeyUtil.setEncodedProfileKey(this, encodedProfileKey)
 
-            // new config
+            // Attempt to grab the details we require to update the profile picture
             val url = TextSecurePreferences.getProfilePictureURL(this)
             val profileKey = ProfileKeyUtil.getProfileKey(this)
 
@@ -291,30 +295,52 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
             }
 
             ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(this@SettingsActivity)
-        }
 
-        // Or if the promise failed to upload the new profile picture then we hit this failUi block
-        uploadProfilePicturePromise.failUi {
-            if (removingProfilePic) {
-                Log.e(TAG, "Failed to remove profile picture")
-                Toast.makeText(this@SettingsActivity, R.string.profileDisplayPictureRemoveError, Toast.LENGTH_LONG).show()
-            } else {
-                Log.e(TAG, "Failed to upload profile picture")
-                Toast.makeText(this@SettingsActivity, R.string.profileErrorUpdate, Toast.LENGTH_LONG).show()
-            }
-        }
-
-        // Finally, regardless of whether the promise succeeded or failed, we always hit this `alwaysUi` block
-        uploadProfilePicturePromise.alwaysUi {
-            if (displayName != null) {
-                binding.btnGroupNameDisplay.text = displayName
-            }
-            if (isUpdatingProfilePicture) {
-                binding.profilePictureView.recycle() // Clear the cached image before updating
+            // Update our visuals
+            binding.profilePictureView.recycle()
             binding.profilePictureView.update()
         }
-            binding.loader.isVisible = false
+
+        // If the sync failed then inform the user
+        updateProfilePicturePromise.failUi { onFail() }
+
+        // Finally, remove the loader animation after we've waited for the attempt to succeed or fail
+        updateProfilePicturePromise.alwaysUi { binding.loader.isVisible = false }
     }
+
+    private fun updateProfilePicture(profilePicture: ByteArray) {
+
+        val haveNetworkConnection = NetworkUtils.haveValidNetworkConnection(this@SettingsActivity);
+        if (!haveNetworkConnection) {
+            Log.w(TAG, "Cannot update profile picture - no network connection.")
+            Toast.makeText(this@SettingsActivity, R.string.profileErrorUpdate, Toast.LENGTH_LONG).show()
+            return
+        }
+
+        val onFail: () -> Unit = {
+            Log.e(TAG, "Sync failed when uploading profile picture.")
+            Toast.makeText(this@SettingsActivity, R.string.profileErrorUpdate, Toast.LENGTH_LONG).show()
+        }
+
+        syncProfilePicture(profilePicture, onFail)
+    }
+
+    private fun removeProfilePicture() {
+
+        val haveNetworkConnection = NetworkUtils.haveValidNetworkConnection(this@SettingsActivity);
+        if (!haveNetworkConnection) {
+            Log.w(TAG, "Cannot remove profile picture - no network connection.")
+            Toast.makeText(this@SettingsActivity, R.string.profileDisplayPictureRemoveError, Toast.LENGTH_LONG).show()
+            return
+        }
+
+        val onFail: () -> Unit = {
+            Log.e(TAG, "Sync failed when removing profile picture.")
+            Toast.makeText(this@SettingsActivity, R.string.profileDisplayPictureRemoveError, Toast.LENGTH_LONG).show()
+        }
+
+        val emptyProfilePicture = ByteArray(0)
+        syncProfilePicture(emptyProfilePicture, onFail)
     }
     // endregion
 
@@ -333,8 +359,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
             Toast.makeText(this, R.string.activity_settings_display_name_too_long_error, Toast.LENGTH_SHORT).show()
             return false
         }
-        updateProfile(false, displayName = displayName)
-        return true
+        return updateDisplayName(displayName)
     }
 
     private fun showQRCode() {
@@ -348,7 +373,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
             view(R.layout.dialog_change_avatar)
             button(R.string.activity_settings_upload) { startAvatarSelection() }
             if (TextSecurePreferences.getProfileAvatarId(context) != 0) {
-                button(R.string.activity_settings_remove) { removeAvatar() }
+                button(R.string.activity_settings_remove) { removeProfilePicture() }
             }
             cancelButton()
         }.apply {
@@ -366,10 +391,6 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
             }
     }
 
-    private fun removeAvatar() {
-        updateProfile(true)
-    }
-
     private fun startAvatarSelection() {
         // Ask for an optional camera permission.
         Permissions.with(this)

app/src/main/res/values-ar-rSA/strings.xml

@@ -186,9 +186,6 @@
     <string name="MediaOverviewActivity_Select_all">أختر الكل</string>
     <string name="MediaOverviewActivity_collecting_attachments">جارٍ جمع المرفقات...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">رسالة وسائط متعددة</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">تنزيل رسالة الوسائط المتعددة</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">خطأ في تنزيل رسالة الوسائط المتعددة، انقر لاعادة المحاولة</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">إرسال إلى %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-ar/strings.xml

@@ -186,9 +186,6 @@
     <string name="MediaOverviewActivity_Select_all">أختر الكل</string>
     <string name="MediaOverviewActivity_collecting_attachments">جارٍ جمع المرفقات...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">رسالة وسائط متعددة</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">تنزيل رسالة الوسائط المتعددة</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">خطأ في تنزيل رسالة الوسائط المتعددة، انقر لاعادة المحاولة</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">إرسال إلى %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-az-rAZ/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Hamısını seç</string>
     <string name="MediaOverviewActivity_collecting_attachments">Qoşmalar yığılır...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimedia mesajı</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">MMS mesaj endirilir</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">MMS mesajı endirmə xətası, yenidən sınamaq üçün toxunun</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">%s - göndər</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-az/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Hamısını seç</string>
     <string name="MediaOverviewActivity_collecting_attachments">Qoşmalar yığılır...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimedia mesajı</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">MMS mesaj endirilir</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">MMS mesajı endirmə xətası, yenidən sınamaq üçün toxunun</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">%s - göndər</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-bal-rBA/strings.xml

@@ -96,9 +96,6 @@
     <string name="MediaOverviewActivity_Select_all">Pilih semua</string>
     <string name="MediaOverviewActivity_collecting_attachments">Mengumpulkan lampiran...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Pesan multimedia</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Mengunduh pesan MMS.</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Gagal saat mengunduh pesan MMS, ketuk untuk mencoba lagi</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Kirim ke %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-bal/strings.xml

@@ -96,9 +96,6 @@
     <string name="MediaOverviewActivity_Select_all">Pilih semua</string>
     <string name="MediaOverviewActivity_collecting_attachments">Mengumpulkan lampiran...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Pesan multimedia</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Mengunduh pesan MMS.</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Gagal saat mengunduh pesan MMS, ketuk untuk mencoba lagi</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Kirim ke %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-bg-rBG/strings.xml

@@ -142,9 +142,6 @@
     <string name="MediaOverviewActivity_Select_all">Избери всичко</string>
     <string name="MediaOverviewActivity_collecting_attachments">Събиране на прикачени файлове...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Мултимедийно съобщение</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Изтегляне на MMS съобщение</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Грешка при изтегляне на MMS съобщение, натиснете за да опитате повторно</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Изпрати на %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-bg/strings.xml

@@ -142,9 +142,6 @@
     <string name="MediaOverviewActivity_Select_all">Избери всичко</string>
     <string name="MediaOverviewActivity_collecting_attachments">Събиране на прикачени файлове...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Мултимедийно съобщение</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Изтегляне на MMS съобщение</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Грешка при изтегляне на MMS съобщение, натиснете за да опитате повторно</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Изпрати на %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-ca-rES/strings.xml

@@ -147,9 +147,6 @@
     <string name="MediaOverviewActivity_Select_all">Selecciona-ho tot</string>
     <string name="MediaOverviewActivity_collecting_attachments">S\'estan adjuntant els fitxers...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Missatge multimèdia</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">S\'està baixant el missatge MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">S\'ha produït un error en baixar el missatge MMS. Toqueu per tornar a intentar-ho</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Envia-ho a %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-ca/strings.xml

@@ -147,9 +147,6 @@
     <string name="MediaOverviewActivity_Select_all">Selecciona-ho tot</string>
     <string name="MediaOverviewActivity_collecting_attachments">S\'estan adjuntant els fitxers...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Missatge multimèdia</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">S\'està baixant el missatge MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">S\'ha produït un error en baixar el missatge MMS. Toqueu per tornar a intentar-ho</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Envia-ho a %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-cs-rCZ/strings.xml

@@ -168,9 +168,6 @@
     <string name="MediaOverviewActivity_Select_all">Označit vše</string>
     <string name="MediaOverviewActivity_collecting_attachments">Shromažďuji přílohy...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimediální zpráva</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Stahuji MMS zprávu</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Chyba při stahování MMS zprávy, ťukněte pro opakování</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Poslat %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-cs/strings.xml

@@ -168,9 +168,6 @@
     <string name="MediaOverviewActivity_Select_all">Označit vše</string>
     <string name="MediaOverviewActivity_collecting_attachments">Shromažďuji přílohy...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimediální zpráva</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Stahuji MMS zprávu</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Chyba při stahování MMS zprávy, ťukněte pro opakování</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Poslat %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-cy-rGB/strings.xml

@@ -172,9 +172,6 @@
     <string name="MediaOverviewActivity_Select_all">Dewis popeth</string>
     <string name="MediaOverviewActivity_collecting_attachments">Casglu atodiadau...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Neges amlgyfrwng</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Llwytho i lawr neges MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Gwall wrth lawrlwytho neges MMS, tapio i geisio eto</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Anfon i %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-cy/strings.xml

@@ -172,9 +172,6 @@
     <string name="MediaOverviewActivity_Select_all">Dewis popeth</string>
     <string name="MediaOverviewActivity_collecting_attachments">Casglu atodiadau...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Neges amlgyfrwng</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Llwytho i lawr neges MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Gwall wrth lawrlwytho neges MMS, tapio i geisio eto</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Anfon i %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-da-rDK/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Vælg alle</string>
     <string name="MediaOverviewActivity_collecting_attachments">Samler vedhæftninger...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimedie besked</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Downloader MMS...</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">MMS besked kunne ikke downloades, tap for at prøve igen</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Send til %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-da/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Vælg alle</string>
     <string name="MediaOverviewActivity_collecting_attachments">Samler vedhæftninger...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimedie besked</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Downloader MMS...</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">MMS besked kunne ikke downloades, tap for at prøve igen</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Send til %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-de-rDE/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Alle auswählen</string>
     <string name="MediaOverviewActivity_collecting_attachments">Anhänge werden gesammelt …</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">MMS</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">MMS wird heruntergeladen …</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Fehler beim Herunterladen der MMS. Für erneuten Versuch antippen.</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">An %s senden</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-de/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Alle auswählen</string>
     <string name="MediaOverviewActivity_collecting_attachments">Anhänge werden gesammelt …</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">MMS</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">MMS wird heruntergeladen …</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Fehler beim Herunterladen der MMS. Für erneuten Versuch antippen.</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">An %s senden</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-el-rGR/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Επιλογή όλων</string>
     <string name="MediaOverviewActivity_collecting_attachments">Τα συνημμένα συλλέγονται...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Μήνυμα πολυμέσων</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Το μήνυμα MMS λαμβάνεται</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Πρόβλημα κατά τη λήψη μηνύματος MMS, πατήστε για να ξαναδοκιμάσουμε</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Αποστολή σε %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-el/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Επιλογή όλων</string>
     <string name="MediaOverviewActivity_collecting_attachments">Τα συνημμένα συλλέγονται...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Μήνυμα πολυμέσων</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Το μήνυμα MMS λαμβάνεται</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Πρόβλημα κατά τη λήψη μηνύματος MMS, πατήστε για να ξαναδοκιμάσουμε</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Αποστολή σε %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-eo-rUY/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Elekti ĉiujn</string>
     <string name="MediaOverviewActivity_collecting_attachments">Kolekto de kunsendaĵoj...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Aŭdvida mesaĝo</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Elŝutante MMS-mesaĝon</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Eraro dum elŝuto de MMS-mesaĝo, tuŝetu por reprovi</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Sendi al %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-eo/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Elekti ĉiujn</string>
     <string name="MediaOverviewActivity_collecting_attachments">Kolekto de kunsendaĵoj...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Aŭdvida mesaĝo</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Elŝutante MMS-mesaĝon</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Eraro dum elŝuto de MMS-mesaĝo, tuŝetu por reprovi</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Sendi al %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-es-rES/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Seleccionar todo</string>
     <string name="MediaOverviewActivity_collecting_attachments">Recopilando adjuntos ...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Mensaje multimedia</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Descargando mensaje MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Fallo al descargar mensaje MMS, toca para reintentar</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Enviar a %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-es/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Seleccionar todo</string>
     <string name="MediaOverviewActivity_collecting_attachments">Recopilando adjuntos ...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Mensaje multimedia</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Descargando mensaje MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Fallo al descargar mensaje MMS, toca para reintentar</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Enviar a %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-et-rEE/strings.xml

@@ -134,9 +134,6 @@
     <string name="MediaOverviewActivity_Select_all">Vali kõik</string>
     <string name="MediaOverviewActivity_collecting_attachments">Kogun manuseid...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimeediasõnum</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Laadin alla MMS-sõnumit</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">MMS-sõnumi allalaadimisel tekkis viga, koputa uuesti proovimiseks</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Saada kohta %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-et/strings.xml

@@ -134,9 +134,6 @@
     <string name="MediaOverviewActivity_Select_all">Vali kõik</string>
     <string name="MediaOverviewActivity_collecting_attachments">Kogun manuseid...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimeediasõnum</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Laadin alla MMS-sõnumit</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">MMS-sõnumi allalaadimisel tekkis viga, koputa uuesti proovimiseks</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Saada kohta %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-fa-rIR/strings.xml

@@ -156,9 +156,6 @@
     <string name="MediaOverviewActivity_Select_all">انتخاب همه</string>
     <string name="MediaOverviewActivity_collecting_attachments">در حال جمع‌آوری پیوست‌ها...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">پیام های چند رسانه ای</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">در حال بارگیری پیام چندرسانه‌ای...</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">بروز مشکل در دانلود پیام MMS، جهت تلاش دوباره تپ کنید</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">ارسال به %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-fa/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">انتخاب همه</string>
     <string name="MediaOverviewActivity_collecting_attachments">در حال جمع‌آوری پیوست‌ها...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">پیام های چند رسانه ای</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">در حال بارگیری پیام چندرسانه‌ای...</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">بروز مشکل در دانلود پیام MMS، جهت تلاش دوباره تپ کنید</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">ارسال به %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-fi-rFI/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Valitse kaikki</string>
     <string name="MediaOverviewActivity_collecting_attachments">Kerätään liitetiedostoja...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimediaviesti</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Ladataan MMS-viestiä</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Virhe ladattaessa MMS-viestiä. Yritä uudelleen napauttamalla.</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Lähetä yhteystiedolle %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-fi/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Valitse kaikki</string>
     <string name="MediaOverviewActivity_collecting_attachments">Kerätään liitetiedostoja...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimediaviesti</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Ladataan MMS-viestiä</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Virhe ladattaessa MMS-viestiä. Yritä uudelleen napauttamalla.</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Lähetä yhteystiedolle %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-fr-rFR/strings.xml

@@ -157,9 +157,6 @@
     <string name="MediaOverviewActivity_Select_all">Tout sélectionner</string>
     <string name="MediaOverviewActivity_collecting_attachments">Récupération des pièces jointes…</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Message multimédia</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Téléchargement du message multimédia</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Erreur de téléchargement du message multimédia. Touchez pour ressayer</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Envoyer à %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-fr/strings.xml

@@ -157,9 +157,6 @@
     <string name="MediaOverviewActivity_Select_all">Tout sélectionner</string>
     <string name="MediaOverviewActivity_collecting_attachments">Récupération des pièces jointes…</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Message multimédia</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Téléchargement du message multimédia</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Erreur de téléchargement du message multimédia. Touchez pour ressayer</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Envoyer à %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-gl-rES/strings.xml

@@ -149,9 +149,6 @@
     <string name="MediaOverviewActivity_Select_all">Seleccionar todo</string>
     <string name="MediaOverviewActivity_collecting_attachments">Recompilando anexos...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Mensaxe multimedia</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Descargando mensaxe MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Erro ao descargar a mensaxe MMS, toca para volver tentar</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Enviar a %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-gl/strings.xml

@@ -149,9 +149,6 @@
     <string name="MediaOverviewActivity_Select_all">Seleccionar todo</string>
     <string name="MediaOverviewActivity_collecting_attachments">Recompilando anexos...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Mensaxe multimedia</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Descargando mensaxe MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Erro ao descargar a mensaxe MMS, toca para volver tentar</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Enviar a %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-ha-rHG/strings.xml

@@ -134,9 +134,6 @@
     <string name="MediaOverviewActivity_Select_all">Gişan bibijêre</string>
     <string name="MediaOverviewActivity_collecting_attachments">...Servehî tên berhevkirin</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Peyama multîmedyayê</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Peyama MMS tê daxistin</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Peyama MMSê nehate daxistin, ji bo dîsa hewldanê bitepîne</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Ji %s re bişîne</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-ha/strings.xml

@@ -134,9 +134,6 @@
     <string name="MediaOverviewActivity_Select_all">Gişan bibijêre</string>
     <string name="MediaOverviewActivity_collecting_attachments">...Servehî tên berhevkirin</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Peyama multîmedyayê</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Peyama MMS tê daxistin</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Peyama MMSê nehate daxistin, ji bo dîsa hewldanê bitepîne</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Ji %s re bişîne</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-hi-rIN/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">सभी को चुन लो स`</string>
     <string name="MediaOverviewActivity_collecting_attachments">अटैचमेंट्स इकट्ठे कर रहे हैं...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">मल्टीमीडिया संदेश</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">एमएमएस संदेश डाउनलोड किया जा रहा है</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">एमएमएस संदेश डाउनलोड करने में त्रुटि, पुनः प्रयास करने के लिए टैप करें</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">%s को भेजें</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-hi/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">सभी को चुन लो स`</string>
     <string name="MediaOverviewActivity_collecting_attachments">अटैचमेंट्स इकट्ठे कर रहे हैं...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">मल्टीमीडिया संदेश</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">एमएमएस संदेश डाउनलोड किया जा रहा है</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">एमएमएस संदेश डाउनलोड करने में त्रुटि, पुनः प्रयास करने के लिए टैप करें</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">%s को भेजें</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-hu-rHU/strings.xml

@@ -151,9 +151,6 @@
     <string name="MediaOverviewActivity_Select_all">Összes kiválasztása</string>
     <string name="MediaOverviewActivity_collecting_attachments">Mellékletek összegyűjtése...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimédia üzenet</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">MMS üzenet letöltése</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Hiba történt az MMS üzenet letöltése során, koppints az újrapróbálkozáshoz</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Küldés neki: %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-hu/strings.xml

@@ -151,9 +151,6 @@
     <string name="MediaOverviewActivity_Select_all">Összes kiválasztása</string>
     <string name="MediaOverviewActivity_collecting_attachments">Mellékletek összegyűjtése...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimédia üzenet</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">MMS üzenet letöltése</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Hiba történt az MMS üzenet letöltése során, koppints az újrapróbálkozáshoz</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Küldés neki: %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-hy-rAM/strings.xml

@@ -155,9 +155,6 @@
     <string name="MediaOverviewActivity_Select_all">Ընտրել բոլորը</string>
     <string name="MediaOverviewActivity_collecting_attachments">Կցորդների հավաքում...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Մուլտիմեդիա հաղորդագրություններ</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Ներբեռնում է MMS հաղորդագրությունը</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Խնդիր առաջացավ MMS հաղորդագրությունը ներբեռնելիս, սեղմեք կրկին փորձելու համար</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Ուղարկել %s֊ին</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-hy/strings.xml

@@ -155,9 +155,6 @@
     <string name="MediaOverviewActivity_Select_all">Ընտրել բոլորը</string>
     <string name="MediaOverviewActivity_collecting_attachments">Կցորդների հավաքում...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Մուլտիմեդիա հաղորդագրություններ</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Ներբեռնում է MMS հաղորդագրությունը</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Խնդիր առաջացավ MMS հաղորդագրությունը ներբեռնելիս, սեղմեք կրկին փորձելու համար</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Ուղարկել %s֊ին</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-in-rID/strings.xml

@@ -126,9 +126,6 @@
     <string name="MediaOverviewActivity_Select_all">Pilih semua</string>
     <string name="MediaOverviewActivity_collecting_attachments">Mengumpulkan semua lampiran...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Pesan Multimedia</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Mengunduh pesan MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Gagal mengunduh pesan MMS, sentuh untuk coba kembali</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Kirim ke %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-in/strings.xml

@@ -126,9 +126,6 @@
     <string name="MediaOverviewActivity_Select_all">Pilih semua</string>
     <string name="MediaOverviewActivity_collecting_attachments">Mengumpulkan semua lampiran...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Pesan Multimedia</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Mengunduh pesan MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Gagal mengunduh pesan MMS, sentuh untuk coba kembali</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Kirim ke %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-it-rIT/strings.xml

@@ -151,9 +151,6 @@
     <string name="MediaOverviewActivity_Select_all">Seleziona tutto</string>
     <string name="MediaOverviewActivity_collecting_attachments">Recupero allegati...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Messaggio multimediale</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Scarico MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Errore nello scaricare MMS, premi per riprovare</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Invia a %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-it/strings.xml

@@ -151,9 +151,6 @@
     <string name="MediaOverviewActivity_Select_all">Seleziona tutto</string>
     <string name="MediaOverviewActivity_collecting_attachments">Recupero allegati...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Messaggio multimediale</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Scarico MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Errore nello scaricare MMS, premi per riprovare</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Invia a %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-iw-rIL/strings.xml

@@ -166,9 +166,6 @@
     <string name="MediaOverviewActivity_Select_all">בחר הכל</string>
     <string name="MediaOverviewActivity_collecting_attachments">אוסף צרופות...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">הודעת מולטימדיה</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">מוריד הודעת MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">שגיאה בהורדת הודעת MMS, הקש כדי לנסות שוב</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">שלח אל %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-iw/strings.xml

@@ -166,9 +166,6 @@
     <string name="MediaOverviewActivity_Select_all">בחר הכל</string>
     <string name="MediaOverviewActivity_collecting_attachments">אוסף צרופות...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">הודעת מולטימדיה</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">מוריד הודעת MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">שגיאה בהורדת הודעת MMS, הקש כדי לנסות שוב</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">שלח אל %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-ja-rJP/strings.xml

@@ -140,9 +140,6 @@
     <string name="MediaOverviewActivity_Select_all">すべて選択</string>
     <string name="MediaOverviewActivity_collecting_attachments">添付ファイルを集めています...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">マルチメディアメッセージ</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">MMSメッセージをダウンロード中</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">MMSメッセージのダウンロード中にエラーが発生しました。タップして再試行してください。</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">%sに送信</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-ja/strings.xml

@@ -140,9 +140,6 @@
     <string name="MediaOverviewActivity_Select_all">すべて選択</string>
     <string name="MediaOverviewActivity_collecting_attachments">添付ファイルを集めています...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">マルチメディアメッセージ</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">MMSメッセージをダウンロード中</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">MMSメッセージのダウンロード中にエラーが発生しました。タップして再試行してください。</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">%sに送信</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-km-rKH/strings.xml

@@ -127,9 +127,6 @@
     <string name="MediaOverviewActivity_Select_all">ជ្រើសរើសទាំងអស់</string>
     <string name="MediaOverviewActivity_collecting_attachments">កំពុងប្រមូលឯកសារភ្ជាប់...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">សារចម្រុះ</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">កំពុងទាញយកសារ MMS </string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">មានបញ្ហាទាញយកសារMMS សូមចុច ដើម្បីព្យាយាមម្តងទៀត</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">ផ្ញើទៅកាន់ %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-km/strings.xml

@@ -127,9 +127,6 @@
     <string name="MediaOverviewActivity_Select_all">ជ្រើសរើសទាំងអស់</string>
     <string name="MediaOverviewActivity_collecting_attachments">កំពុងប្រមូលឯកសារភ្ជាប់...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">សារចម្រុះ</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">កំពុងទាញយកសារ MMS </string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">មានបញ្ហាទាញយកសារMMS សូមចុច ដើម្បីព្យាយាមម្តងទៀត</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">ផ្ញើទៅកាន់ %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-kn-rIN/strings.xml

@@ -75,7 +75,6 @@
     <string name="MediaOverviewActivity_Documents">ದಾಖಲೆಗಳು</string>
     <string name="MediaOverviewActivity_Select_all">ಎಲ್ಲ ಆಯ್ದುಕೊಳ್ಳಿ</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">ಮಲ್ಟಿಮೀಡಿಯಾ ಸಂದೇಶ</string>
     <!-- MediaPickerActivity -->
     <!-- MediaSendActivity -->
     <!-- MediaRepository -->

app/src/main/res/values-kn/strings.xml

@@ -75,7 +75,6 @@
     <string name="MediaOverviewActivity_Documents">ದಾಖಲೆಗಳು</string>
     <string name="MediaOverviewActivity_Select_all">ಎಲ್ಲ ಆಯ್ದುಕೊಳ್ಳಿ</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">ಮಲ್ಟಿಮೀಡಿಯಾ ಸಂದೇಶ</string>
     <!-- MediaPickerActivity -->
     <!-- MediaSendActivity -->
     <!-- MediaRepository -->

app/src/main/res/values-ko-rKR/strings.xml

@@ -136,9 +136,6 @@
     <string name="MediaOverviewActivity_Select_all">모두 선택</string>
     <string name="MediaOverviewActivity_collecting_attachments">첨부파일 저장 준비 중…</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">멀티미디어 메시지</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">MMS 메시지 내려 받는 중</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">MMS 내려 받기 오류, 다시 보내려면 다시 시도를 눌러주세요.</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">%s에게 전송</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-ko/strings.xml

@@ -136,9 +136,6 @@
     <string name="MediaOverviewActivity_Select_all">모두 선택</string>
     <string name="MediaOverviewActivity_collecting_attachments">첨부파일 저장 준비 중…</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">멀티미디어 메시지</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">MMS 메시지 내려 받는 중</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">MMS 내려 받기 오류, 다시 보내려면 다시 시도를 눌러주세요.</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">%s에게 전송</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-lt-rLT/strings.xml

@@ -166,9 +166,6 @@
     <string name="MediaOverviewActivity_Select_all">Žymėti visus</string>
     <string name="MediaOverviewActivity_collecting_attachments">Renkami priedai...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimedijos žinutė</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Atsiunčiama MMS žinutė</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Klaida, atsiunčiant MMS žinutę, bakstelėkite, norėdami bandyti dar kartą</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Siųsti adresatui %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-lt/strings.xml

@@ -166,9 +166,6 @@
     <string name="MediaOverviewActivity_Select_all">Žymėti visus</string>
     <string name="MediaOverviewActivity_collecting_attachments">Renkami priedai...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimedijos žinutė</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Atsiunčiama MMS žinutė</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Klaida, atsiunčiant MMS žinutę, bakstelėkite, norėdami bandyti dar kartą</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Siųsti adresatui %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-mk-rMK/strings.xml

@@ -87,9 +87,6 @@
     <string name="MediaOverviewActivity_Select_all">အားလုံးကို ရွေးပါ</string>
     <string name="MediaOverviewActivity_collecting_attachments">ပူးတွဲဖိုင်များကို စုစည်းနေသည် </string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">ရုပ်၊သံပါ အချက်အလက်များ</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">MMS များအား ဒေါင်းလုပ်ဆွဲမည်</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">MMS များအားဒေါင်းလုပ်ဆွဲနေစဉ် ရပ်တန့်သွားသည်၊ ပြန်စရန် နှိပ်ပါ</string>
     <!-- MediaPickerActivity -->
     <!-- MediaSendActivity -->
     <!-- MediaRepository -->

app/src/main/res/values-mk/strings.xml

@@ -87,9 +87,6 @@
     <string name="MediaOverviewActivity_Select_all">အားလုံးကို ရွေးပါ</string>
     <string name="MediaOverviewActivity_collecting_attachments">ပူးတွဲဖိုင်များကို စုစည်းနေသည် </string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">ရုပ်၊သံပါ အချက်အလက်များ</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">MMS များအား ဒေါင်းလုပ်ဆွဲမည်</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">MMS များအားဒေါင်းလုပ်ဆွဲနေစဉ် ရပ်တန့်သွားသည်၊ ပြန်စရန် နှိပ်ပါ</string>
     <!-- MediaPickerActivity -->
     <!-- MediaSendActivity -->
     <!-- MediaRepository -->

app/src/main/res/values-nb-rNO/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Velg alle</string>
     <string name="MediaOverviewActivity_collecting_attachments">Henter vedlegg …</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimediemelding</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Laster ned MMS-melding</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Feil under nedlasting av MMS-melding. Trykk for å prøve igjen</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Send til %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-nb/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Velg alle</string>
     <string name="MediaOverviewActivity_collecting_attachments">Henter vedlegg …</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimediemelding</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Laster ned MMS-melding</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Feil under nedlasting av MMS-melding. Trykk for å prøve igjen</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Send til %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-nl-rNL/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Alles selecteren</string>
     <string name="MediaOverviewActivity_collecting_attachments">Bijlagen aan het verzamelen…</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimediabericht</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Mms-bericht aan het downloaden</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Fout bij downloaden van mms-bericht, tik om opnieuw te proberen</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Verzenden naar %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-nl/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Alles selecteren</string>
     <string name="MediaOverviewActivity_collecting_attachments">Bijlagen aan het verzamelen…</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimediabericht</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Mms-bericht aan het downloaden</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Fout bij downloaden van mms-bericht, tik om opnieuw te proberen</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Verzenden naar %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-nn-rNO/strings.xml

@@ -132,9 +132,6 @@
     <string name="MediaOverviewActivity_Select_all">Vel alle</string>
     <string name="MediaOverviewActivity_collecting_attachments">Hentar vedlegg …</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimediemelding</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Lastar ned MMS-melding</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Klarte ikkje lasta ned MMS-melding, trykk for å prøva igjen</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Send til %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-nn/strings.xml

@@ -132,9 +132,6 @@
     <string name="MediaOverviewActivity_Select_all">Vel alle</string>
     <string name="MediaOverviewActivity_collecting_attachments">Hentar vedlegg …</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimediemelding</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Lastar ned MMS-melding</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Klarte ikkje lasta ned MMS-melding, trykk for å prøva igjen</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Send til %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-ny-rMW/strings.xml

@@ -125,9 +125,6 @@
     <string name="MediaOverviewActivity_Documents">Pankakuna</string>
     <string name="MediaOverviewActivity_Select_all">Tukuyta akllana</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimedia chaski</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">MMS chaskita uryakuchikun</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">MMS chaski mana uryakurkachu, kutinlla rurapay</string>
     <!-- MediaPickerActivity -->
     <!-- MediaSendActivity -->
     <!-- MediaRepository -->

app/src/main/res/values-ny/strings.xml

@@ -125,9 +125,6 @@
     <string name="MediaOverviewActivity_Documents">Pankakuna</string>
     <string name="MediaOverviewActivity_Select_all">Tukuyta akllana</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimedia chaski</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">MMS chaskita uryakuchikun</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">MMS chaski mana uryakurkachu, kutinlla rurapay</string>
     <!-- MediaPickerActivity -->
     <!-- MediaSendActivity -->
     <!-- MediaRepository -->

app/src/main/res/values-pl-rPL/strings.xml

@@ -168,9 +168,6 @@
     <string name="MediaOverviewActivity_Select_all">Zaznacz wszystko</string>
     <string name="MediaOverviewActivity_collecting_attachments">Zbieranie załączników...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Wiadomość multimedialna</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Pobieranie wiadomości MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Błąd podczas pobierania wiadomości MMS. Dotknij, aby spróbować ponownie.</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Wyślij do %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-pl/strings.xml

@@ -168,9 +168,6 @@
     <string name="MediaOverviewActivity_Select_all">Zaznacz wszystko</string>
     <string name="MediaOverviewActivity_collecting_attachments">Zbieranie załączników...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Wiadomość multimedialna</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Pobieranie wiadomości MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Błąd podczas pobierania wiadomości MMS. Dotknij, aby spróbować ponownie.</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Wyślij do %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-pt-rBR/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Selecionar todos</string>
     <string name="MediaOverviewActivity_collecting_attachments">Coletando anexos...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Mensagem multimídia</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Fazendo download de mensagem MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Erro fazendo download de mensagem MMS, toque para retentar</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Enviar para %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-pt-rPT/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Seleccionar tudo</string>
     <string name="MediaOverviewActivity_collecting_attachments">A recolher anexos...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Mensagem multimédia</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">A descarregar MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Erro ao descarregar a mensagem MMS, toque para repetir</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Enviar para %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-pt/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Selecionar todos</string>
     <string name="MediaOverviewActivity_collecting_attachments">Coletando anexos...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Mensagem multimídia</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Fazendo download de mensagem MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Erro fazendo download de mensagem MMS, toque para retentar</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Enviar para %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-ro-rRO/strings.xml

@@ -160,9 +160,6 @@
     <string name="MediaOverviewActivity_Select_all">Selectează tot</string>
     <string name="MediaOverviewActivity_collecting_attachments">Se colectează atașamentele...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Mesaj multimedia</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Se descarcă mesajul MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Eroare la descărcarea mesajului MMS, apasă pentru reîncercare</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Trimiteți la %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-ro/strings.xml

@@ -160,9 +160,6 @@
     <string name="MediaOverviewActivity_Select_all">Selectează tot</string>
     <string name="MediaOverviewActivity_collecting_attachments">Se colectează atașamentele...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Mesaj multimedia</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Se descarcă mesajul MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Eroare la descărcarea mesajului MMS, apasă pentru reîncercare</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Trimiteți la %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-ru-rRU/strings.xml

@@ -168,9 +168,6 @@
     <string name="MediaOverviewActivity_Select_all">Выбрать все</string>
     <string name="MediaOverviewActivity_collecting_attachments">Сбор вложений...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">MMS-сообщение</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Загрузка MMS-сообщения</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Ошибка при скачивании MMS-сообщения; нажмите для повтора</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Отправить пользователю %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-ru/strings.xml

@@ -168,9 +168,6 @@
     <string name="MediaOverviewActivity_Select_all">Выбрать все</string>
     <string name="MediaOverviewActivity_collecting_attachments">Сбор вложений...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">MMS-сообщение</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Загрузка MMS-сообщения</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Ошибка при скачивании MMS-сообщения; нажмите для повтора</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Отправить пользователю %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-si-rLK/strings.xml

@@ -61,8 +61,6 @@
     <string name="MediaOverviewActivity_Media">මාධ්‍යය</string>
     <string name="MediaOverviewActivity_Documents">ලේඛන</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">බහුමාධ්‍ය පණිවිඩය</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">මාධ්‍ය පණිවිඩය බාගතවෙමින්</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">%s ට යවන්න</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-si/strings.xml

@@ -61,8 +61,6 @@
     <string name="MediaOverviewActivity_Media">මාධ්‍යය</string>
     <string name="MediaOverviewActivity_Documents">ලේඛන</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">බහුමාධ්‍ය පණිවිඩය</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">මාධ්‍ය පණිවිඩය බාගතවෙමින්</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">%s ට යවන්න</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-sk-rSK/strings.xml

@@ -164,9 +164,6 @@
     <string name="MediaOverviewActivity_Select_all">Označiť všetko</string>
     <string name="MediaOverviewActivity_collecting_attachments">Ukladám prílohy...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimediálna správa</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Preberanie MMS správy</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Chyba pri preberaní MMS správy, ťuknite pre opakovanie</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Poslať používateľovi %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-sk/strings.xml

@@ -164,9 +164,6 @@
     <string name="MediaOverviewActivity_Select_all">Označiť všetko</string>
     <string name="MediaOverviewActivity_collecting_attachments">Ukladám prílohy...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimediálna správa</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Preberanie MMS správy</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Chyba pri preberaní MMS správy, ťuknite pre opakovanie</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Poslať používateľovi %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-sq-rAL/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Përzgjidhi krejt</string>
     <string name="MediaOverviewActivity_collecting_attachments">Po mblidhen bashkëngjitje…</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Mesazh multimedia</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Po shkarkohet mesazh MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Gabim në shkarkim mesazhi MMS, prekeni që të riprovohet</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Dërgoje te %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-sq/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Përzgjidhi krejt</string>
     <string name="MediaOverviewActivity_collecting_attachments">Po mblidhen bashkëngjitje…</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Mesazh multimedia</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Po shkarkohet mesazh MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Gabim në shkarkim mesazhi MMS, prekeni që të riprovohet</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Dërgoje te %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-sr-rSP/strings.xml

@@ -157,9 +157,6 @@
     <string name="MediaOverviewActivity_Select_all">Изабери све</string>
     <string name="MediaOverviewActivity_collecting_attachments">Сакупљам прилоге...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Мултимедијална порука</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Преузимам ММС поруку</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Грешка при преузимању ММС поруке, тапните да покушам поново</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Пошаљи %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-sr/strings.xml

@@ -157,9 +157,6 @@
     <string name="MediaOverviewActivity_Select_all">Изабери све</string>
     <string name="MediaOverviewActivity_collecting_attachments">Сакупљам прилоге...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Мултимедијална порука</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Преузимам ММС поруку</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Грешка при преузимању ММС поруке, тапните да покушам поново</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Пошаљи %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-sv-rSE/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Markera alla</string>
     <string name="MediaOverviewActivity_collecting_attachments">Samlar bifogade filer...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimediameddelande</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Hämtning av MMS-meddelanden</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Fel vid hämtning av MMS-meddelanden, tryck för att försöka igen</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Skicka till %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-sv/strings.xml

@@ -150,9 +150,6 @@
     <string name="MediaOverviewActivity_Select_all">Markera alla</string>
     <string name="MediaOverviewActivity_collecting_attachments">Samlar bifogade filer...</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Multimediameddelande</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">Hämtning av MMS-meddelanden</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Fel vid hämtning av MMS-meddelanden, tryck för att försöka igen</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">Skicka till %s</string>
     <!-- MediaSendActivity -->

app/src/main/res/values-sw-rKE/strings.xml

@@ -100,9 +100,6 @@
     <string name="MediaOverviewActivity_Select_all">Chagua vyote</string>
     <string name="MediaOverviewActivity_collecting_attachments">kukusanya viambatisho</string>
     <!-- NotificationMmsMessageRecord -->
-    <string name="NotificationMmsMessageRecord_multimedia_message">Ujumbe wa Multimedia</string>
-    <string name="NotificationMmsMessageRecord_downloading_mms_message">kupakua ujumbe wa mms</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Hitilafu kupakua ujumbe wa MMS, bomba ili ujaribu tena</string>
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity_send_to">tuma kwa 1%s</string>
     <!-- MediaSendActivity -->