.gitlab-ci.yml

+image: registry.silence.dev/silence/android-ci:29
+
+variables:
+  GIT_SUBMODULE_STRATEGY: "recursive"
+  ANDROID_AVD_TEST_IMG:   "system-images;android-29;default;x86_64"
+
+stages:
+  - build
+  - test
+
+buildWitness:
+  stage: build
+  script:
+    - ./scripts/build-witness.sh
+
+assembleDebug:
+  stage: build
+  script:
+    - ./scripts/find-missing-strings.sh
+    - ./gradlew assembleDebug
+  artifacts:
+    paths:
+    - build/outputs/
+
+debugTests:
+  stage: test
+  script:
+    - sdkmanager --sdk_root=${ANDROID_HOME} ${ANDROID_AVD_TEST_IMG} >/dev/null
+    - avdmanager create avd --force --name android-10 -k ${ANDROID_AVD_TEST_IMG} --device "Nexus 5X"
+    - emulator -avd android-10 -wipe-data -no-window -no-audio -gpu swiftshader_indirect &
+    - /usr/bin/android-wait-for-emulator
+    - adb shell input keyevent 82 &
+    - ./gradlew connectedCheck -PdisablePreDex -PtaskThreads=1 -PandroidThread=1

.travis.yml

-language: android
-cache:
-  directories:
-  - $HOME/.android
-sudo: false
-
-jdk:
-  - oraclejdk8
-
-env:
-  - QEMU_AUDIO_DRV=none
-
-android:
-  components:
-    - tools
-    - platform-tools
-    - build-tools-25.1.1
-    - build-tools-25.0.3
-    - build-tools-25.0.2
-    - build-tools-23.0.2
-    - build-tools-23.0.1
-    - build-tools-22.0.1
-    - build-tools-22.0.0
-    - build-tools-21.1.2
-    - build-tools-21.1.1
-    - build-tools-20.0.0
-    - build-tools-19.1.0
-    - android-25
-    - android-24
-    - android-21
-    - android-22
-    - android-19
-    - extra-android-m2repository
-    - sys-img-armeabi-v7a-android-24
-
-before_script:
-     - echo no | android create avd --force -n test -t android-24 --abi armeabi-v7a
-     - emulator -avd test -no-skin -no-window &
-     - android-wait-for-emulator
-     - adb shell input keyevent 82 &
-
-script:
-     - ./scripts/find-missing-strings.sh
-     - ./scripts/build-witness.sh
-     - ./gradlew connectedCheck -PdisablePreDex -PtaskThreads=1 -PandroidThread=1
-     - rm -rf ~/.android/avd
-
-after_success:
-     - ./scripts/travis-upload.sh $KEY

AndroidManifest.xml

@@ -55,6 +55,11 @@
                    android:resource="@xml/badge_widget_provider"/>
     </receiver>
 
+    <receiver android:name="org.smssecure.smssecure.util.dualsim.SimChangedReceiver">
+        <intent-filter>
+            <action android:name="android.intent.action.SIM_STATE_CHANGED"/>
+        </intent-filter>
+    </receiver>
 
     <meta-data android:name="org.smssecure.smssecure.mms.SilenceGlideModule"
                android:value="GlideModule" />

README.md

-# Silence [![Build Status](https://travis-ci.org/SilenceIM/Silence.svg?branch=master)](https://travis-ci.org/SilenceIM/Silence)
+# Silence [![Build Status](https://git.silence.dev/Silence/Silence-Android/badges/master/pipeline.svg)](https://git.silence.dev/Silence/Silence-Android/pipelines)[![Translation Status](https://translate.silence.dev/widgets/silence/-/svg-badge.svg)](https://translate.silence.dev/projects/silence/)
 
 [Silence](https://silence.im) (formerly SMSSecure) is an SMS/MMS application that allows you to protect your privacy while communicating with friends.
 

build.gradle

@@ -123,7 +123,7 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        versionCode 145
+        versionCode 212
         versionName "0.15.16"
 
         minSdkVersion 14

res/layout/conversation_item_received.xml

@@ -72,29 +72,6 @@
                     android:textSize="@dimen/conversation_item_body_text_size"
                     android:linksClickable="true" />
 
-            <LinearLayout android:id="@+id/mms_download_controls"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:orientation="horizontal">
-
-                <Button android:id="@+id/mms_download_button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="@string/conversation_item_received__download"
-                        android:visibility="gone" />
-
-                <TextView android:id="@+id/mms_label_downloading"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_marginLeft="5dp"
-                          android:layout_marginRight="5dp"
-                          android:gravity="center"
-                          android:text="@string/conversation_item_received__downloading"
-                          android:visibility="gone" />
-
-            </LinearLayout>
-
             <LinearLayout android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:paddingTop="2dip"

res/layout/conversation_item_sent.xml

@@ -63,29 +63,6 @@
                     android:textSize="@dimen/conversation_item_body_text_size"
                     tools:text="Mango pickle lorem ipsum" />
 
-            <LinearLayout android:id="@+id/mms_download_controls"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:orientation="horizontal">
-
-                <Button android:id="@+id/mms_download_button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="@string/conversation_item_sent__download"
-                        android:visibility="gone" />
-
-                <TextView android:id="@+id/mms_label_downloading"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_marginLeft="5dp"
-                          android:layout_marginRight="5dp"
-                          android:gravity="center"
-                          android:text="@string/conversation_item_sent__downloading"
-                          android:visibility="gone" />
-
-            </LinearLayout>
-
             <LinearLayout android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:orientation="horizontal"

res/layout/media_overview_activity.xml

@@ -21,6 +21,6 @@
               android:gravity="center_horizontal"
               android:paddingTop="30dp"
               android:visibility="gone"
-              android:text="@string/media_overview_activity__no_images" />
+              android:text="@string/media_overview_activity__no_media" />
 
 </RelativeLayout>

res/layout/media_overview_item.xml

@@ -8,6 +8,6 @@
             android:id="@+id/image"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:contentDescription="@string/media_preview_activity__image_content_description" />
+            android:contentDescription="@string/media_preview_activity__media_content_description" />
 
 </org.smssecure.smssecure.components.SquareFrameLayout>

res/layout/media_preview_activity.xml

@@ -9,7 +9,7 @@
                android:id="@+id/image"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
-               android:contentDescription="@string/media_preview_activity__image_content_description" />
+               android:contentDescription="@string/media_preview_activity__media_content_description" />
 
     <org.smssecure.smssecure.video.VideoPlayer
             android:id="@+id/video_player"

res/layout/receive_key_dialog.xml

-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="fill_parent"
-             android:layout_height="fill_parent">
-
-    <TextView style="@style/Registration.Description"
-              android:id="@+id/description_text"
-              android:layout_width="fill_parent"
-              android:layout_marginBottom="16dip"
-              android:layout_marginTop="16dip"/>
-</FrameLayout>

res/layout/thumbnail_view.xml

@@ -10,6 +10,18 @@
                android:scaleType="fitCenter"
                android:contentDescription="@string/conversation_item__mms_image_description" />
 
+    <ImageView android:id="@+id/play_overlay"
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:layout_gravity="center"
+               android:gravity="center"
+               android:clickable="false"
+               android:longClickable="false"
+               android:src="@drawable/ic_play_circle_outline_white_48dp"
+               android:tint="#77ffffff"
+               android:tintMode="src_in"
+               android:visibility="gone"/>
+
     <ViewStub android:id="@+id/transfer_controls_stub"
               android:layout_width="70dp"
               android:layout_height="70dp"

res/layout/view_identity_activity.xml

@@ -10,14 +10,13 @@
                   android:layout_gravity="center"
                   android:orientation="vertical">
 
-        <TextView
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:typeface="monospace"
-                android:id="@+id/identity_fingerprint"
-                android:text=""
-                android:padding="7dip" />
+        <TextView android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:textAppearance="?android:attr/textAppearanceLarge"
+                  android:typeface="monospace"
+                  android:id="@+id/identity_fingerprint"
+                  android:text=""
+                  android:padding="7dip" />
 
     </LinearLayout>
 </ScrollView>

res/menu/conversation.xml

@@ -4,7 +4,7 @@
     <item android:title="@string/conversation__menu_add_attachment"
           android:id="@+id/menu_add_attachment" />
 
-    <item android:title="@string/conversation__menu_view_media"
+    <item android:title="@string/conversation__menu_view_all_media"
           android:id="@+id/menu_view_media" />
 
     <item android:title="@string/conversation__menu_archive_conversation"

res/menu/conversation_insecure_no_push.xml

@@ -8,6 +8,10 @@
               <item android:title="@string/conversation_insecure__menu_start_secure_session"
                     android:id="@+id/menu_start_secure_session" />
 
+              <item android:title="@string/conversation_insecure__menu_start_secure_session"
+                    android:id="@+id/menu_start_secure_session_dual_sim">
+                  <menu></menu>
+              </item>
           </menu>
     </item>
 </menu>