From 59d3518a4cd8b81b4fab0525eeedf7a2eec5935d Mon Sep 17 00:00:00 2001 From: Matt Hills Date: Tue, 15 Apr 2025 20:58:51 -0400 Subject: [PATCH] getting ready for github roleout --- app/src/main/AndroidManifest.xml | 4 ++-- .../com/mattintech/simplelogupload/util/PreferencesUtil.java | 4 +++- app/src/main/res/layout/activity_welcome.xml | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 46be7ff..f5f6f5f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,14 +10,14 @@ diff --git a/app/src/main/java/com/mattintech/simplelogupload/util/PreferencesUtil.java b/app/src/main/java/com/mattintech/simplelogupload/util/PreferencesUtil.java index 1ed2c54..bacb4ce 100644 --- a/app/src/main/java/com/mattintech/simplelogupload/util/PreferencesUtil.java +++ b/app/src/main/java/com/mattintech/simplelogupload/util/PreferencesUtil.java @@ -100,7 +100,9 @@ public class PreferencesUtil { public static String getServerBaseUrl(Context context) { String address = getServerAddress(context); int port = getServerPort(context); - return "http://" + address + ":" + port; + // Use HTTPS for port 443 (standard HTTPS port) + String protocol = (port == 443) ? "https://" : "http://"; + return protocol + address + ":" + port; } /** diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml index 85fb1ee..8c63669 100644 --- a/app/src/main/res/layout/activity_welcome.xml +++ b/app/src/main/res/layout/activity_welcome.xml @@ -10,7 +10,8 @@ android:layout_width="120dp" android:layout_height="120dp" android:layout_marginTop="32dp" - android:src="@android:drawable/ic_menu_upload" + android:src="@drawable/ic_app_icon" + android:contentDescription="SimpleLogUpload logo" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />