getting ready for github roleout
This commit is contained in:
@@ -10,14 +10,14 @@
|
|||||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
|
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:allowBackup="true"
|
android:allowBackup="false"
|
||||||
android:icon="@drawable/ic_app_icon"
|
android:icon="@drawable/ic_app_icon"
|
||||||
android:label="SimpleLogUpload"
|
android:label="SimpleLogUpload"
|
||||||
android:networkSecurityConfig="@xml/network_security_config"
|
android:networkSecurityConfig="@xml/network_security_config"
|
||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:largeHeap="true"
|
android:largeHeap="true"
|
||||||
android:requestLegacyExternalStorage="true"
|
android:requestLegacyExternalStorage="true"
|
||||||
android:usesCleartextTraffic="true"
|
android:usesCleartextTraffic="false"
|
||||||
android:theme="@style/Theme.AppCompat.DayNight.DarkActionBar">
|
android:theme="@style/Theme.AppCompat.DayNight.DarkActionBar">
|
||||||
|
|
||||||
<!-- Main Activity -->
|
<!-- Main Activity -->
|
||||||
|
|||||||
@@ -100,7 +100,9 @@ public class PreferencesUtil {
|
|||||||
public static String getServerBaseUrl(Context context) {
|
public static String getServerBaseUrl(Context context) {
|
||||||
String address = getServerAddress(context);
|
String address = getServerAddress(context);
|
||||||
int port = getServerPort(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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -10,7 +10,8 @@
|
|||||||
android:layout_width="120dp"
|
android:layout_width="120dp"
|
||||||
android:layout_height="120dp"
|
android:layout_height="120dp"
|
||||||
android:layout_marginTop="32dp"
|
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_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|||||||
Reference in New Issue
Block a user