From af36361f4268d36b01a7cf6b975d643e995b7508 Mon Sep 17 00:00:00 2001
From: Maksym H <Maksym48@pm.me>
Date: Thu, 5 Jan 2023 02:28:43 +0200
Subject: [PATCH] Android: rename `initializePathsAndroid()` to
 `initializePaths()`

---
 src/main.cpp            | 7 +------
 src/porting.cpp         | 2 +-
 src/porting_android.cpp | 2 +-
 src/porting_android.h   | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 2f2bc5cba..f7e06afba 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -160,13 +160,8 @@ int main(int argc, char *argv[])
 
 #ifdef __ANDROID__
 	porting::initAndroid();
-	porting::initializePathsAndroid();
-#elif defined(__IOS__)
-	porting::initializePathsiOS();
-	porting::copyAssets();
-#else
-	porting::initializePaths();
 #endif
+	porting::initializePaths();
 
 	if (!create_userdata_path()) {
 		errorstream << "Cannot create user data directory" << std::endl;
diff --git a/src/porting.cpp b/src/porting.cpp
index 9db8a6e26..64fcc26df 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -520,6 +520,7 @@ bool setSystemPaths()
 
 #endif
 
+#if !defined(__ANDROID__) && !defined(__IOS__)
 void initializePaths()
 {
 #if RUN_IN_PLACE
@@ -623,7 +624,6 @@ void initializePaths()
 #endif  // USE_GETTEXT
 }
 
-#if !defined(__ANDROID__) && !defined(__IOS__)
 // Dummy for other OS
 bool hasRealKeyboard()
 {
diff --git a/src/porting_android.cpp b/src/porting_android.cpp
index 850817d1b..1ca848be5 100644
--- a/src/porting_android.cpp
+++ b/src/porting_android.cpp
@@ -190,7 +190,7 @@ static std::string getAndroidPath(
 	return javaStringToUTF8(js_path);
 }
 
-void initializePathsAndroid()
+void initializePaths()
 {
 	// Get Environment class
 	jclass cls_Env = jnienv->FindClass("android/os/Environment");
diff --git a/src/porting_android.h b/src/porting_android.h
index 8a79ba8c9..cf7438722 100644
--- a/src/porting_android.h
+++ b/src/porting_android.h
@@ -42,7 +42,7 @@ void cleanupAndroid();
 /**
  * Initializes path_* variables for Android
  */
-void initializePathsAndroid();
+void initializePaths();
 
 /**
  * show text input dialog in java