Merge pull request #2876 from msupply-foundation/2867-android-offline

Android issues when running offline

Author: mark-prins

client/packages/android/app/src/main/assets/capacitor.config.json

@@ -1,6 +1,6 @@
 {
 	"appId": "org.openmsupply.client",
-	"appName": "openmsupply-client",
+	"appName": "Open mSupply",
 	"webDir": "../host/dist/",
 	"bundledWebRuntime": false,
 	"android": {

client/packages/android/app/src/main/java/org/openmsupply/client/NativeApi.java

@@ -366,7 +366,12 @@ private String getHostAddress(NsdServiceInfo serviceInfo, Boolean isLocal){
         } catch (Exception ex) {
             Log.e(OM_SUPPLY, ex.toString());
         }
-        return serviceInfo.getHost().getHostAddress();
+        InetAddress host = serviceInfo.getHost();
+        // this will happen if there is no network interface available
+        if (host == null) {
+            return "127.0.0.1";
+        }
+        return host.getHostAddress();
     }
 
     private JSObject serviceInfoToObject(NsdServiceInfo serviceInfo) {
@@ -513,7 +518,8 @@ public FrontEndHost(JSObject data) {
          * e.g. https://127.0.0.1:8000
          */
         public String getUrl() {
-            return data.getString("protocol") + "://" + data.getString("ip") + ":" + data.getString("port");
+            String host = data.getBool("isLocal") ? "localhost" : data.getString("ip");
+            return data.getString("protocol") + "://" + host + ":" + data.getString("port");
         }
 
         /**

client/packages/android/app/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="app_name">openmsupply-client</string>
-    <string name="title_activity_main">openmsupply-client</string>
+    <string name="app_name">Open mSupply</string>
+    <string name="title_activity_main">Open mSupply</string>
     <string name="package_name">org.openmsupply.client</string>
     <string name="custom_url_scheme">org.openmsupply.client</string>
 </resources>

client/packages/android/capacitor.config.ts

@@ -5,7 +5,7 @@ import { CapacitorConfig } from '@capacitor/cli';
 
 const config: CapacitorConfig = {
   appId: 'org.openmsupply.client',
-  appName: 'openmsupply-client',
+  appName: 'Open mSupply',
   // This is only needed for `npx cap copy` to work, and it does have to point to actual bundle
   // bundle is server by remote server (local or discovered) or through webpack if debugging (see comment below)
   webDir: '../host/dist/',

client/packages/host/src/components/Android.tsx

@@ -126,7 +126,7 @@ export const Android = () => {
     // this page is not for web users! begone!
     if (!getNativeAPI()) navigate(RouteBuilder.create(AppRoute.Login).build());
     getPreference('mode', '"none"').then(setLocalMode);
-  }, []);
+  }, [navigate]);
 
   useEffect(() => {
     if (mode === NativeMode.Server) {
@@ -145,7 +145,7 @@ export const Android = () => {
           .build()
       );
     }
-  }, [mode, previousServer, connectToPreviousFailed]);
+  }, [mode, previousServer, connectToPreviousFailed, navigate]);
 
   if (mode === NativeMode.None)
     return (

client/packages/host/src/components/Login/LoginLayout.tsx

@@ -40,7 +40,7 @@ export const LoginLayout = ({
         flex="1 0 50%"
         sx={{
           backgroundImage: (theme: Theme) => theme.mixins.gradient.primary,
-          padding: '0 80px 7% 80px',
+          padding: '0 5% 7%',
         }}
         display="flex"
         alignItems="flex-start"
@@ -52,8 +52,8 @@ export const LoginLayout = ({
             sx={{
               color: (theme: Theme) => theme.typography.login.color,
               fontSize: {
-                xs: '38px',
-                sm: '38px',
+                xs: '28px',
+                sm: '30px',
                 md: '48px',
                 lg: '64px',
                 xl: '64px',

package.json

@@ -1,11 +1,11 @@
 {
   "name": "open-msupply",
   "//": "Main version for the app, should be in semantic version format (any release candidate or test build should be separated by '-' i.e. 1.1.1-rc1 or 1.1.1-test",
-  "version": "1.6.00",
+  "version": "1.6.01",
   "private": true,
   "scripts": {
     "start": "cd ./server && cargo run & cd ./client && yarn start-local",
     "build": "cd ./client && yarn build && cd ../server && cargo build --release",
     "test": "cd ./server && ulimit -n 1000 && cargo test && cd ../client && yarn test"
   }
-}
+}