empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update device-transfer app build to work with the latest libsignal

Browse source
This commit is contained in:
Chris Eager 2022-06-17 10:54:03 -07:00 • committed by Cody Henthorne
parent 53c60e1f6d
commit 05b7055678
5 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
device-transfer/app/build.gradle
View file

@ -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 {

2
device-transfer/app/src/main/AndroidManifest.xml
View file

@ -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"

3
device-transfer/app/src/main/java/org/signal/devicetransfer/app/MainActivity.java
View file

@ -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);
}

11
device-transfer/app/src/main/res/layout/activity_main.xml
View file

@ -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>

2
device-transfer/lib/build.gradle
View file

@ -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