aw-server: Fix compilation on android

Author: johan-bjareholt

aw-server/src/android/mod.rs

@@ -7,6 +7,7 @@ use std::ffi::{CStr, CString};
 use std::os::raw::c_char;
 use std::sync::Mutex;
 
+use crate::device_id;
 use crate::dirs;
 
 use android_logger::Config;
@@ -111,6 +112,7 @@ pub mod android {
         let server_state = endpoints::ServerState {
             datastore: Mutex::new(openDatastore()),
             asset_path: PathBuf::from(asset_path),
+            device_id: device_id::get_device_id(),
         };
 
         let mut config = AWConfig::default();

aw-server/src/device_id.rs

@@ -0,0 +1,19 @@
+use std::fs;
+
+use uuid::Uuid;
+
+use crate::dirs;
+
+/// Retrieves the device ID, if none exists it generates one (using UUID v4)
+pub fn get_device_id() -> String {
+    // I chose get_data_dir over get_config_dir since the latter isn't yet supported on Android.
+    let mut path = dirs::get_data_dir().unwrap();
+    path.push("device_id");
+    if path.exists() {
+        fs::read_to_string(path).unwrap()
+    } else {
+        let uuid = Uuid::new_v4().to_hyphenated().to_string();
+        fs::write(path, &uuid).unwrap();
+        uuid
+    }
+}

aw-server/src/lib.rs

@@ -31,6 +31,7 @@ extern crate toml;
 #[macro_use]
 pub mod macros;
 pub mod config;
+pub mod device_id;
 pub mod dirs;
 pub mod endpoints;
 pub mod logging;

aw-server/src/main.rs

@@ -4,10 +4,8 @@ extern crate getopts;
 
 use getopts::Options;
 use rocket::config::Environment;
-use uuid::Uuid;
 
 use std::env;
-use std::fs;
 
 use aw_server::*;
 
@@ -22,20 +20,6 @@ fn print_usage(program: &str, opts: Options) {
     print!("{}", opts.usage(&brief));
 }
 
-/// Retrieves the device ID, if none exists it generates one (using UUID v4)
-fn get_device_id() -> String {
-    // I chose get_data_dir over get_config_dir since the latter isn't yet supported on Android.
-    let mut path = dirs::get_data_dir().unwrap();
-    path.push("device_id");
-    if path.exists() {
-        fs::read_to_string(path).unwrap()
-    } else {
-        let uuid = Uuid::new_v4().to_hyphenated().to_string();
-        fs::write(path, &uuid).unwrap();
-        uuid
-    }
-}
-
 fn main() {
     use std::sync::Mutex;
 
@@ -84,7 +68,7 @@ fn main() {
         // it will not happen there
         datastore: Mutex::new(aw_datastore::Datastore::new(db_path, true)),
         asset_path,
-        device_id: get_device_id(),
+        device_id: device_id::get_device_id(),
     };
 
     endpoints::build_rocket(server_state, config).launch();