Skip to content

WIP: Use "D-Bus over TCP/IP over Ethernet over BLE" for communicating with the watch #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

WIP: Use "D-Bus over TCP/IP over Ethernet over BLE" for communicating with the watch #216

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f2ebab8
Add SlirpService for Ethernet over BLE
I-asked Apr 30, 2024
97694fe
Use D-Bus over TCP for bi-directional notification handling
I-asked May 2, 2024
07ced7b
Use modern dbus-java fork, add experimental D-Bus MediaService
I-asked May 3, 2024
b779742
Fix some dbus-java-related issues
I-asked May 3, 2024
b92560c
Replace bound properties with manual property handling
I-asked May 4, 2024
e2983d7
Simplify MPRIS property access
I-asked May 4, 2024
96afc2f
Make synchronization more efficient
I-asked May 4, 2024
9a74b3f
Use device volume instead of content volume in MediaService
I-asked May 4, 2024
dbe7b93
Reconnect D-Bus upon connection loss
I-asked May 4, 2024
92f7812
Separate the D-Bus infrastructure from SlirpService
I-asked May 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
plugins {
id("com.android.application")
kotlin("android")
}

android {
compileSdk = 33
buildToolsVersion = "30.0.3"
compileSdk = 34

defaultConfig {
applicationId = "org.asteroidos.sync"
minSdk = 24
targetSdk = 33
targetSdk = 34
versionCode = 29
versionName = "0.29"
ndk.abiFilters.clear()
ndk.abiFilters.add("arm64-v8a")
ndk.abiFilters.add("armeabi-v7a")
ndk.abiFilters.add("x86")
ndk.abiFilters.add("x86_64")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uh, now these are re-added and cgi is deleted. That's a lot of back and forths to review. I realize the PR is marked as draft, it would be nice to clean up this backlog. I'll stop reviewing here until then ;)

externalNativeBuild {
cmake {
cppFlags += ""
Expand All @@ -39,7 +42,7 @@ android {
srcDir("src/main/lib/powerampapi/poweramp_api_lib/res/")
}
jniLibs {
srcDir("/work/android-root/lib")
srcDir("/tmp/android-root/lib")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, this is supposed to be the outcome of the bash script now. Maybe it doesn't hurt to add a comment above to describe where this is coming from

}
}
}
Expand All @@ -48,6 +51,10 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "17"
}

lint {
checkReleaseBuilds = true
disable += "MissingTranslation"
Expand Down Expand Up @@ -80,4 +87,11 @@ dependencies {
implementation("no.nordicsemi.android.support.v18:scanner:1.6.0")
implementation("no.nordicsemi.android:ble:2.7.2")
implementation("com.google.guava:guava:33.1.0-android")
implementation("com.github.hypfvieh:dbus-java-core:5.0.0")
implementation("com.github.hypfvieh:dbus-java-transport-tcp:5.0.0")
implementation("androidx.media3:media3-session:1.3.1")
implementation("androidx.media3:media3-common:1.3.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1-Beta")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.8.1-Beta")

}
4 changes: 2 additions & 2 deletions app/src/main/cpp/build_depends.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ EOF.
+++ meson.build 2024-04-27 11:44:38.569868768 +0200
@@ -2170 +2170 @@
- libiconv = dependency('iconv')
+ libiconv = [cc.find_library('iconv', required : true, dirs : ['/work/android-root/lib'])]
+ libiconv = [cc.find_library('iconv', required : true, dirs : ['${PREFIX}/lib/${ABI}'])]
EOF.


Expand All @@ -130,4 +130,4 @@ EOF.
>&2 ninja -C ./_builddir/ install
>&2 echo "All depends ready"

popd
popd
Loading