kopia lustrzana https://github.com/ryukoposting/Signal-Android
Update device-transfer app build to work with the latest libsignal
rodzic
53c60e1f6d
commit
05b7055678
|
@ -11,6 +11,12 @@ android {
|
||||||
|
|
||||||
minSdkVersion MINIMUM_SDK
|
minSdkVersion MINIMUM_SDK
|
||||||
targetSdkVersion TARGET_SDK
|
targetSdkVersion TARGET_SDK
|
||||||
|
|
||||||
|
ndk {
|
||||||
|
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
|
||||||
|
}
|
||||||
|
|
||||||
|
buildConfigField "String", "LIBSIGNAL_VERSION", "\"libsignal ${libs.versions.libsignal.client.get()}\""
|
||||||
}
|
}
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="org.signal.devicetransfer.app">
|
package="org.signal.devicetransfer.app">
|
||||||
|
|
||||||
|
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
android:icon="@mipmap/ic_launcher"
|
android:icon="@mipmap/ic_launcher"
|
||||||
|
|
|
@ -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);
|
EventBus.getDefault().register(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/enable_permission" />
|
app:layout_constraintTop_toBottomOf="@+id/libsignal_version" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/start_client"
|
android:id="@+id/start_client"
|
||||||
|
@ -55,4 +55,13 @@
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/start_server" />
|
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>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
@ -22,7 +22,7 @@ android {
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation libs.androidx.appcompat
|
implementation libs.androidx.appcompat
|
||||||
implementation project(':core-util')
|
implementation project(':core-util')
|
||||||
implementation libs.libsignal.client
|
implementation libs.libsignal.android
|
||||||
api libs.greenrobot.eventbus
|
api libs.greenrobot.eventbus
|
||||||
|
|
||||||
testImplementation testLibs.junit.junit
|
testImplementation testLibs.junit.junit
|
||||||
|
|
Ładowanie…
Reference in New Issue