From 05b705567894b0450908360fae6545ce5d6673bf Mon Sep 17 00:00:00 2001
From: Chris Eager <79161849+eager-signal@users.noreply.github.com>
Date: Fri, 17 Jun 2022 10:54:03 -0700
Subject: [PATCH] Update device-transfer app build to work with the latest
 libsignal

---
 device-transfer/app/build.gradle                      |  6 ++++++
 device-transfer/app/src/main/AndroidManifest.xml      |  2 ++
 .../org/signal/devicetransfer/app/MainActivity.java   |  3 +++
 .../app/src/main/res/layout/activity_main.xml         | 11 ++++++++++-
 device-transfer/lib/build.gradle                      |  2 +-
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/device-transfer/app/build.gradle b/device-transfer/app/build.gradle
index 5f2263479..8af90a2a4 100644
--- a/device-transfer/app/build.gradle
+++ b/device-transfer/app/build.gradle
@@ -11,6 +11,12 @@ android {
 
         minSdkVersion MINIMUM_SDK
         targetSdkVersion TARGET_SDK
+
+        ndk {
+            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+        }
+
+        buildConfigField "String", "LIBSIGNAL_VERSION", "\"libsignal ${libs.versions.libsignal.client.get()}\""
     }
 
     compileOptions {
diff --git a/device-transfer/app/src/main/AndroidManifest.xml b/device-transfer/app/src/main/AndroidManifest.xml
index f52af0ad3..7bc8f9465 100644
--- a/device-transfer/app/src/main/AndroidManifest.xml
+++ b/device-transfer/app/src/main/AndroidManifest.xml
@@ -3,6 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.signal.devicetransfer.app">
 
+  <uses-permission android:name="android.permission.WAKE_LOCK" />
+
   <application
       android:allowBackup="true"
       android:icon="@mipmap/ic_launcher"
diff --git a/device-transfer/app/src/main/java/org/signal/devicetransfer/app/MainActivity.java b/device-transfer/app/src/main/java/org/signal/devicetransfer/app/MainActivity.java
index e0be15757..cdd8aad8e 100644
--- a/device-transfer/app/src/main/java/org/signal/devicetransfer/app/MainActivity.java
+++ b/device-transfer/app/src/main/java/org/signal/devicetransfer/app/MainActivity.java
@@ -88,6 +88,9 @@ public class MainActivity extends AppCompatActivity {
       }
     });
 
+    final TextView libsignalVersion = findViewById(R.id.libsignal_version);
+    libsignalVersion.setText(BuildConfig.LIBSIGNAL_VERSION);
+
     EventBus.getDefault().register(this);
   }
 
diff --git a/device-transfer/app/src/main/res/layout/activity_main.xml b/device-transfer/app/src/main/res/layout/activity_main.xml
index 3a767e8ba..4e0b843ba 100644
--- a/device-transfer/app/src/main/res/layout/activity_main.xml
+++ b/device-transfer/app/src/main/res/layout/activity_main.xml
@@ -44,7 +44,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/enable_permission" />
+        app:layout_constraintTop_toBottomOf="@+id/libsignal_version" />
 
     <Button
         android:id="@+id/start_client"
@@ -55,4 +55,13 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/start_server" />
 
+    <TextView
+        android:id="@+id/libsignal_version"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="libsignal: unknown"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/enable_permission" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/device-transfer/lib/build.gradle b/device-transfer/lib/build.gradle
index 86c2be5ab..ffc6d7175 100644
--- a/device-transfer/lib/build.gradle
+++ b/device-transfer/lib/build.gradle
@@ -22,7 +22,7 @@ android {
 dependencies {
     implementation libs.androidx.appcompat
     implementation project(':core-util')
-    implementation libs.libsignal.client
+    implementation libs.libsignal.android
     api libs.greenrobot.eventbus
 
     testImplementation testLibs.junit.junit