Merge branch 'dev' into strings-squashed

libsession/build.gradle

@@ -33,6 +33,12 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    namespace 'org.session.libsession'
 }
 
 dependencies {

libsession/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.session.libsession" />
+<manifest />

libsession/src/main/java/org/session/libsession/avatars/PlaceholderAvatarPhoto.kt

@@ -3,10 +3,12 @@ package org.session.libsession.avatars
 import com.bumptech.glide.load.Key
 import java.security.MessageDigest
 
-class PlaceholderAvatarPhoto(val hashString: String,
-                             val displayName: String): Key {
+data class PlaceholderAvatarPhoto(
+    val hashString: String,
+    val displayName: String?
+) : Key {
     override fun updateDiskCacheKey(messageDigest: MessageDigest) {
         messageDigest.update(hashString.encodeToByteArray())
-        messageDigest.update(displayName.encodeToByteArray())
+        messageDigest.update(displayName?.encodeToByteArray() ?: byteArrayOf())
     }
 }

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

@@ -1,7 +1,7 @@
 package org.session.libsession.utilities
 
 // Non-translatable strings for use with the UI
-object StringSubstitutionConstants {
+object NonTranslatableStringConstants {
     const val APP_NAME               = "Session"
     const val ARBISCAN               = "Arbiscan"
     const val ARBITRUM               = "Arbitrum"

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

@@ -155,6 +155,7 @@
     <string name="authenticateFailedTooManyAttempts">Too many failed authentication attempts. Please try again later.</string>
     <string name="authenticateNotAccessed">Authentication could not be accessed.</string>
     <string name="authenticateToOpen">Authenticate to open {app_name}.</string>
+    <string name="back">Back</string>
     <string name="banDeleteAll">Ban and Delete All</string>
     <string name="banErrorFailed">Ban failed</string>
     <string name="banUnbanErrorFailed">Unban failed</string>