Merge branch 'od' into on-2

libsession/src/main/java/org/session/libsession/messaging/jobs/RetrieveProfileAvatarJob.kt

@@ -38,7 +38,7 @@ class RetrieveProfileAvatarJob(private val profileAvatar: String?, val recipient
     }
 
     override suspend fun execute(dispatcherName: String) {
-        val delegate = delegate ?: return
+        val delegate = delegate ?: return Log.w(TAG, "RetrieveProfileAvatarJob has no delegate method to work with!")
         if (profileAvatar in errorUrls) return delegate.handleJobFailed(this, dispatcherName, Exception("Profile URL 404'd this app instance"))
         val context = MessagingModuleConfiguration.shared.context
         val storage = MessagingModuleConfiguration.shared.storage

libsession/src/main/java/org/session/libsession/utilities/StringSubKeys.kt

@@ -0,0 +1,29 @@
+package org.session.libsession.utilities
+
+// String substitution keys for use with the Phrase library.
+// Note: The substitution will be to {app_name} etc. in the strings - but do NOT include the curly braces in these keys!
+object StringSubstitutionConstants {
+    const val APP_NAME_KEY                   = "app_name"
+    const val COMMUNITY_NAME_KEY             = "community_name"
+    const val CONVERSATION_COUNT_KEY         = "conversation_count"
+    const val CONVERSATION_NAME_KEY          = "conversation_name"
+    const val COUNT_KEY                      = "count"
+    const val DATE_TIME_KEY                  = "date_time"
+    const val DISAPPEARING_MESSAGES_TYPE_KEY = "disappearing_messages_type"
+    const val DOWNLOAD_URL_KEY               = "download_url" // Used to invite people to download Session
+    const val EMOJI_KEY                      = "emoji"
+    const val FILE_TYPE_KEY                  = "file_type"
+    const val GROUP_NAME_KEY                 = "group_name"
+    const val MEMBERS_KEY                    = "members"
+    const val MESSAGE_COUNT_KEY              = "message_count"
+    const val NAME_KEY                       = "name"
+    const val OTHER_NAME_KEY                 = "other_name"
+    const val QUERY_KEY                      = "query"
+    const val SECONDS_KEY                    = "seconds"
+    const val TOTAL_COUNT_KEY                = "total_count"
+    const val TIME_KEY                       = "time"
+    const val TIME_LARGE_KEY                 = "time_large"
+    const val TIME_SMALL_KEY                 = "time_small"
+    const val URL_KEY                        = "url"
+    const val VERSION_KEY                    = "version"
+}

libsession/src/main/res/values/strings.xml

@@ -83,4 +83,7 @@
 
     <string name="profileDisplayPictureRemoveError">Failed to remove display picture.</string>
     <string name="profileErrorUpdate">Failed to update profile.</string>
+  
+    <!-- Added for SS-40 -->
+    <string name="attachmentsNotification">{emoji} Attachment</string>
 </resources>