TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-23 06:31:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge dev into master for 1.17.5

Browse Source
This commit is contained in:
Andrew 2023-12-11 17:22:31 +10:30 committed by GitHub
commit bdb6e7d12b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -31,8 +31,8 @@ configurations.all {
exclude module: "commons-logging" exclude module: "commons-logging"
} }
def canonicalVersionCode = 359 def canonicalVersionCode = 360
def canonicalVersionName = "1.17.4" def canonicalVersionName = "1.17.5"
def postFixSize = 10 def postFixSize = 10
def abiPostFix = ['armeabi-v7a' : 1, def abiPostFix = ['armeabi-v7a' : 1,

2
app/src/main/java/org/thoughtcrime/securesms/webrtc/PeerConnectionWrapper.kt
View File

@ -50,7 +50,7 @@ class PeerConnectionWrapper(private val context: Context,
private fun initPeerConnection() { private fun initPeerConnection() {
val random = SecureRandom().asKotlinRandom() 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") PeerConnection.IceServer.builder("turn:$sub.getsession.org")
.setUsername("session202111") .setUsername("session202111")
.setPassword("053c268164bc7bd7") .setPassword("053c268164bc7bd7")

2
app/src/main/res/layout/fragment_enter_community_url.xml
View File

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

7
app/src/main/res/values/strings.xml
View File

@ -57,6 +57,9 @@
<string name="AccessibilityId_new_direct_message">New direct message</string> <string name="AccessibilityId_new_direct_message">New direct message</string>
<string name="AccessibilityId_create_group">Create group</string> <string name="AccessibilityId_create_group">Create group</string>
<string name="AccessibilityId_join_community">Join community</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)--> <!-- Conversation options (three dots menu)-->
<string name="AccessibilityId_all_media">All media</string> <string name="AccessibilityId_all_media">All media</string>
<string name="AccessibilityId_search">Search</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_block_message_request_button">Block message request</string>
<string name="AccessibilityId_timer_icon">Timer icon</string> <string name="AccessibilityId_timer_icon">Timer icon</string>
<!-- Configuration messages --> <!-- 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">Blocked banner</string>
<string name="AccessibilityId_blocked_banner_text">Blocked banner text</string> <string name="AccessibilityId_blocked_banner_text">Blocked banner text</string>
<!--New Session --> <!--New Session -->
@ -118,7 +121,7 @@
<string name="AccessibilityId_message_sent_status_pending">Message sent status pending</string> <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_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_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_voice_message">Voice message</string>
<string name="AccessibilityId_document">Document</string> <string name="AccessibilityId_document">Document</string>
<string name="AccessibilityId_deleted_message">Deleted message</string> <string name="AccessibilityId_deleted_message">Deleted message</string>