Merge dev into master for 1.17.5

oxen-io · Dec 11, 2023 · bdb6e7d · bdb6e7d
2 parents 9d02eb3 + 377460a
commit bdb6e7d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -31,8 +31,8 @@ configurations.all {
     exclude module: "commons-logging"
 }
 
-def canonicalVersionCode = 359
-def canonicalVersionName = "1.17.4"
+def canonicalVersionCode = 360
+def canonicalVersionName = "1.17.5"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/PeerConnectionWrapper.kt b/app/src/main/java/org/thoughtcrime/securesms/webrtc/PeerConnectionWrapper.kt
@@ -50,7 +50,7 @@ class PeerConnectionWrapper(private val context: Context,
 
     private fun initPeerConnection() {
         val random = SecureRandom().asKotlinRandom()
-        val iceServers = listOf("freyr","fenrir","frigg","angus","hereford","holstein", "brahman").shuffled(random).take(2).map { sub ->
+        val iceServers = listOf("freyr","angus","hereford","holstein", "brahman").shuffled(random).take(2).map { sub ->
             PeerConnection.IceServer.builder("turn:$sub.getsession.org")
                 .setUsername("session202111")
                 .setPassword("053c268164bc7bd7")

diff --git a/app/src/main/res/layout/fragment_enter_community_url.xml b/app/src/main/res/layout/fragment_enter_community_url.xml
@@ -25,6 +25,7 @@
         android:layout_marginTop="@dimen/large_spacing"
         android:gravity="center_vertical"
         android:hint="@string/fragment_enter_community_url_edit_text_hint"
+        android:contentDescription="@string/AccessibilityId_community_input_box"
         android:inputType="textUri"
         android:maxLines="3"
         android:paddingTop="0dp"
@@ -91,6 +92,7 @@
     <Button
         android:id="@+id/joinCommunityButton"
         style="@style/Widget.Session.Button.Common.ProminentOutline"
+        android:contentDescription="@string/AccessibilityId_join_community_button"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginVertical="@dimen/large_spacing"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -57,6 +57,9 @@
     <string name="AccessibilityId_new_direct_message">New direct message</string>
     <string name="AccessibilityId_create_group">Create group</string>
     <string name="AccessibilityId_join_community">Join community</string>
+    <!-- Join community pop up -->
+    <string name="AccessibilityId_community_input_box">Community input</string>
+    <string name="AccessibilityId_join_community_button">Join community button</string>
     <!--  Conversation options (three dots menu)-->
     <string name="AccessibilityId_all_media">All media</string>
     <string name="AccessibilityId_search">Search</string>
@@ -89,7 +92,7 @@
     <string name="AccessibilityId_block_message_request_button">Block message request</string>
     <string name="AccessibilityId_timer_icon">Timer icon</string>
 <!--    Configuration messages -->
-    <string name="AccessibilityId_control_message">Configuration message</string>
+    <string name="AccessibilityId_control_message">Control message</string>
     <string name="AccessibilityId_blocked_banner">Blocked banner</string>
     <string name="AccessibilityId_blocked_banner_text">Blocked banner text</string>
     <!--New Session -->
@@ -118,7 +121,7 @@
     <string name="AccessibilityId_message_sent_status_pending">Message sent status pending</string>
     <string name="AccessibilityId_message_sent_status_syncing">Message sent status syncing</string>
     <string name="AccessibilityId_message_request_config_message">Message request has been accepted</string>
-    <string name="AccessibilityId_message_body">Message Body</string>
+    <string name="AccessibilityId_message_body">Message body</string>
     <string name="AccessibilityId_voice_message">Voice message</string>
     <string name="AccessibilityId_document">Document</string>
     <string name="AccessibilityId_deleted_message">Deleted message</string>