From 9127a18ff0c2a19ad3012f02f1829d29c84d3bd4 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Wed, 8 Mar 2023 02:49:41 +0000 Subject: [PATCH] With approximately this code, I was able to establish an SHS connection with my phone. git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4204 ed5197a5-7fde-0310-b194-c3ffbd925b24 --- Makefile | 3 +++ src/android/AndroidManifest.xml | 1 + src/android/com/unprompted/tildefriends/MainActivity.java | 4 +++- src/main.c | 1 + src/ssb.c | 2 +- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bbd2927f..c124d610 100644 --- a/Makefile +++ b/Makefile @@ -403,6 +403,9 @@ out/TildeFriends.apk: out/TildeFriends.unsigned.apk @echo [apksigner] $(notdir $@) @$(ANDROID_BUILD_TOOLS)/apksigner sign --ks keystore.jks --ks-key-alias androidKey --ks-pass pass:android --key-pass pass:android --out $@ $< +apk: out/TildeFriends.apk +.PHONY: apk + clean: rm -rf $(BUILD_DIR) .PHONY: clean diff --git a/src/android/AndroidManifest.xml b/src/android/AndroidManifest.xml index 60427241..3ebbc8b5 100644 --- a/src/android/AndroidManifest.xml +++ b/src/android/AndroidManifest.xml @@ -4,6 +4,7 @@ versionCode="1" versionName="0.0.4"> + diff --git a/src/android/com/unprompted/tildefriends/MainActivity.java b/src/android/com/unprompted/tildefriends/MainActivity.java index 50427537..ef980251 100644 --- a/src/android/com/unprompted/tildefriends/MainActivity.java +++ b/src/android/com/unprompted/tildefriends/MainActivity.java @@ -11,7 +11,9 @@ public class MainActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); TextView text = (TextView)findViewById(R.id.my_text); - Log.w("tildefriends", String.format("external files dir is %s", getFilesDir().toString())); + Log.w("tildefriends", String.format("getFilesDir() is %s", getFilesDir().toString())); + Log.w("tildefriends", String.format("getPackageResourcePath() is %s", getPackageResourcePath().toString())); + Log.w("tildefriends", String.format("getPackageCodePath() is %s", getPackageCodePath().toString())); setFilesPath(getFilesDir().toString()); text.setText(getMessage()); } diff --git a/src/main.c b/src/main.c index 59f62c1c..6cd0aa89 100644 --- a/src/main.c +++ b/src/main.c @@ -362,6 +362,7 @@ static int _tf_run_task(const tf_run_args_t* args, int index) result = 0; } tf_task_destroy(task); + tf_printf("_tf_run_task is done. Goodbye.\n"); return result; } diff --git a/src/ssb.c b/src/ssb.c index df58973d..e2d8e54a 100644 --- a/src/ssb.c +++ b/src/ssb.c @@ -2585,7 +2585,7 @@ static void _tf_ssb_send_broadcast(tf_ssb_t* ssb, struct sockaddr_in* address) int r = uv_udp_try_send(&ssb->broadcast_sender, &buf, 1, (struct sockaddr*)&broadcast_addr); if (r < 0) { - tf_printf("failed to send broadcast %d: %s\n", r, uv_strerror(r)); + tf_printf("failed to send broadcast for %s (%d): %s\n", address_str, r, uv_strerror(r)); } }