Merge pull request #4 from enbop/android_support

Android support

Author: Heap-Hop

Cargo.lock

@@ -94,7 +94,7 @@ impl FungiConfig {
         self.custom_hostname
             .as_ref()
             .cloned()
-            .or(fungi_util::sysinfo::System::host_name())
+            .or(fungi_util::get_hostname())
     }
 
     pub fn set_custom_hostname(&self, hostname: Option<String>) -> Result<Self> {

crates/config/src/lib.rs

@@ -8,8 +8,15 @@ use libp2p::PeerId;
 use crate::FungiDaemon;
 
 impl FungiDaemon {
-    pub fn host_name() -> Option<String> {
-        fungi_util::sysinfo::System::host_name()
+    pub fn host_name(&self) -> Option<String> {
+        self.config().lock().get_hostname()
+    }
+
+    #[cfg(target_os = "android")]
+    pub fn init_mobile_device_name(name: String) {
+        {
+            fungi_util::init_mobile_device_name(name);
+        }
     }
 
     pub fn peer_id(&self) -> String {

crates/daemon/src/api.rs

@@ -14,7 +14,8 @@ impl Default for PeerHandshakePayload {
 impl PeerHandshakePayload {
     pub fn new() -> Self {
         Self {
-            host_name: fungi_util::sysinfo::System::host_name(),
+            // TODO: use [FungiConfig::get_hostname]
+            host_name: fungi_util::get_hostname(),
         }
     }
 

crates/swarm/src/peer_handshake.rs

@@ -2,7 +2,12 @@ pub mod ipc;
 pub mod keypair;
 pub mod protocols;
 
-pub use sysinfo;
+#[cfg(target_os = "android")]
+mod mobile_device_info;
+#[cfg(target_os = "android")]
+pub use mobile_device_info::init_mobile_device_name;
+
+use sysinfo;
 
 pub fn get_local_ip() -> Option<String> {
     if let Ok(socket) = std::net::UdpSocket::bind("0.0.0.0:0") {
@@ -14,3 +19,12 @@ pub fn get_local_ip() -> Option<String> {
     }
     None
 }
+
+pub fn get_hostname() -> Option<String> {
+    #[cfg(target_os = "android")]
+    {
+        return mobile_device_info::get_mobile_device_name();
+    }
+    #[cfg(not(target_os = "android"))]
+    sysinfo::System::host_name()
+}

crates/util/src/lib.rs

@@ -0,0 +1,15 @@
+use std::sync::OnceLock;
+
+static MOBILE_DEVICE_NAME: OnceLock<String> = OnceLock::new();
+
+pub fn init_mobile_device_name(name: String) {
+    if MOBILE_DEVICE_NAME.get().is_some() {
+        log::warn!("Mobile device name has already been initialized.");
+        return;
+    }
+    MOBILE_DEVICE_NAME.set(name).unwrap();
+}
+
+pub fn get_mobile_device_name() -> Option<String> {
+    MOBILE_DEVICE_NAME.get().cloned()
+}

crates/util/src/mobile_device_info.rs

@@ -6,9 +6,9 @@ plugins {
 }
 
 android {
-    namespace = "com.enbop.fungi_app"
+    namespace = "rs.fungi.fungi_app"
     compileSdk = flutter.compileSdkVersion
-    ndkVersion = flutter.ndkVersion
+    ndkVersion = "29.0.13846066"
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
@@ -21,7 +21,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "com.enbop.fungi_app"
+        applicationId = "rs.fungi.fungi_app"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion

flutter_app/android/app/build.gradle.kts

@@ -1,6 +1,19 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Network permissions for P2P networking -->
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
+
+    <!-- Foreground service permissions -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <!-- foregroundServiceType: dataSync -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+    
     <application
-        android:label="fungi_app"
+        android:label="Fungi App"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
@@ -30,6 +43,17 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+
+        <!-- Foreground service notification icon -->
+        <meta-data
+            android:name="logo_transparent_white"
+            android:resource="@drawable/logo_transparent_white" />
+
+        <!-- Warning: Do not change service name. -->
+        <service 
+            android:name="com.pravera.flutter_foreground_task.service.ForegroundService"
+            android:foregroundServiceType="dataSync|remoteMessaging"
+            android:exported="false" />
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and

flutter_app/android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
-package com.enbop.fungi_app
+package rs.fungi.fungi_app
 
 import io.flutter.embedding.android.FlutterActivity