From 5b5457f606eb49cbdab8c36cee8951493fd4053c Mon Sep 17 00:00:00 2001
From: XProger <xproger@list.ru>
Date: Sat, 23 Feb 2019 08:47:04 +0300
Subject: [PATCH] #15 Android store settings file to content directory
 (/sdcard/OpenLara)

---
 src/platform/android/app/CMakeLists.txt        |  2 +-
 .../android/app/src/main/AndroidManifest.xml   |  4 ++--
 src/utils.h                                    | 18 ++++++++++++++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/platform/android/app/CMakeLists.txt b/src/platform/android/app/CMakeLists.txt
index bcb1d54..da2b5cf 100644
--- a/src/platform/android/app/CMakeLists.txt
+++ b/src/platform/android/app/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.4.1)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DANDROID -std=c++11 -fno-rtti -fno-exceptions -fvisibility=hidden -Wall")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DANDROID -std=c++11 -fno-rtti -fno-exceptions -fvisibility=hidden -Wall -Wno-invalid-source-encoding")
 
 add_library( game SHARED
              src/main/cpp/main.cpp
diff --git a/src/platform/android/app/src/main/AndroidManifest.xml b/src/platform/android/app/src/main/AndroidManifest.xml
index 830723f..3bf325d 100644
--- a/src/platform/android/app/src/main/AndroidManifest.xml
+++ b/src/platform/android/app/src/main/AndroidManifest.xml
@@ -10,9 +10,9 @@
     <uses-feature android:name="android.hardware.audio.low_latency" />
     <!--
         <uses-permission android:name="android.permission.INTERNET" />
-        <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     -->
-        <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
         android:allowBackup="true"
diff --git a/src/utils.h b/src/utils.h
index 2dc8bc0..27d0f7c 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -1482,11 +1482,25 @@ struct Stream {
     }
 
     static void cacheRead(const char *name, Callback *callback = NULL, void *userData = NULL) {
-        osCacheRead(new Stream(name, NULL, 0, callback, userData));
+        Stream *stream = new Stream(name, NULL, 0, callback, userData);
+        #ifdef _OS_ANDROID // use saveDir for settings on android devices
+            if (name && strcmp(name, "settings") == 0) {
+                osReadSlot(stream);
+                return;
+            }
+        #endif
+        osCacheRead(stream);
     }
 
     static void cacheWrite(const char *name, const char *data, int size, Callback *callback = NULL, void *userData = NULL) {
-        osCacheWrite(new Stream(name, data, size, callback, userData));
+        Stream *stream = new Stream(name, data, size, callback, userData);
+        #ifdef _OS_ANDROID // use saveDir for settings on android devices
+            if (name && strcmp(name, "settings") == 0) {
+                osWriteSlot(stream);
+                return;
+            }
+        #endif
+        osCacheWrite(stream);
     }
 
     static bool exists(const char *name) {