diff --git a/clientapp/android/.idea/deploymentTargetSelector.xml b/clientapp/android/.idea/deploymentTargetSelector.xml
index 62142c75..2acdd2df 100644
--- a/clientapp/android/.idea/deploymentTargetSelector.xml
+++ b/clientapp/android/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-06-07T03:32:03.225856Z">
+        <DropdownSelection timestamp="2024-06-09T06:45:44.709948700Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=2290f8ee" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=R3CX307ZHXD" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/clientapp/android/app/build.gradle.kts b/clientapp/android/app/build.gradle.kts
index 96972531..f04ccc25 100644
--- a/clientapp/android/app/build.gradle.kts
+++ b/clientapp/android/app/build.gradle.kts
@@ -1,3 +1,5 @@
+import com.android.ide.common.gradle.RELEASE
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.jetbrains.kotlin.android)
@@ -15,16 +17,16 @@ android {
         versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        externalNativeBuild {
-            cmake {
-                cppFlags += ""
-            }
-        }
     }
 
     buildTypes {
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
+            isShrinkResources = true
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+        debug {
+            applicationIdSuffix = ".dev"
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
@@ -52,13 +54,15 @@ dependencies {
     implementation(libs.androidx.appcompat)
     implementation(libs.material)
     implementation(libs.androidx.activity)
-    implementation(libs.androidx.constraintlayout)
     implementation(libs.androidx.lifecycle.livedata.ktx)
     implementation(libs.androidx.lifecycle.viewmodel.ktx)
     implementation(libs.androidx.navigation.fragment.ktx)
     implementation(libs.androidx.navigation.ui.ktx)
     implementation(libs.androidx.preference.ktx)
-    implementation(libs.androidx.preference)
+    implementation(libs.androidx.fragment.ktx)
+    implementation(libs.oshai.kotlin.logging.jvm)
+    runtimeOnly(libs.slf4j.simple)
+
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
diff --git a/clientapp/android/app/proguard-rules.pro b/clientapp/android/app/proguard-rules.pro
index 481bb434..cdc313f0 100644
--- a/clientapp/android/app/proguard-rules.pro
+++ b/clientapp/android/app/proguard-rules.pro
@@ -14,7 +14,7 @@
 
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+-keepattributes SourceFile,LineNumberTable
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
diff --git a/clientapp/android/app/src/main/AndroidManifest.xml b/clientapp/android/app/src/main/AndroidManifest.xml
index 02ddd845..37d32559 100644
--- a/clientapp/android/app/src/main/AndroidManifest.xml
+++ b/clientapp/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
 
     <application
diff --git a/clientapp/android/app/src/main/cpp/tgbotclient.cpp b/clientapp/android/app/src/main/cpp/tgbotclient.cpp
index 39a8f49b..fe2cac5b 100644
--- a/clientapp/android/app/src/main/cpp/tgbotclient.cpp
+++ b/clientapp/android/app/src/main/cpp/tgbotclient.cpp
@@ -5,6 +5,7 @@
 #include <jni.h>
 #include <unistd.h>
 #include <zlib.h>
+#include <sys/poll.h>
 
 #include <cstring>
 #include <string>
@@ -26,8 +27,17 @@ using namespace TgBotSocket::callback;
 struct SocketConfig {
     std::string address;
     enum { USE_IPV4, USE_IPV6 } mode;
+    int port;
+
+    int timeout_s = 5;
 };
 
+#define SOCKNATIVE_JAVACLS "com/royna/tgbotclient/SocketCommandNative"
+#define SOCKNATIVE_CMDCB_JAVACLS SOCKNATIVE_JAVACLS "$ICommandCallback"
+#define SOCKNATIVE_DSTINFO_JAVACLS SOCKNATIVE_JAVACLS "$DestinationInfo"
+#define SOCKNATIVE_DSTTYPE_JAVACLS SOCKNATIVE_JAVACLS "$DestinationType"
+#define STRING_JAVACLS "java/lang/String"
+
 class TgBotSocketNative {
    public:
     void sendContext(Packet &packet, JNIEnv *env, jobject callbackObj) const {
@@ -50,6 +60,7 @@ class TgBotSocketNative {
     void setSocketConfig(SocketConfig config_in) {
         config = std::move(config_in);
     }
+    SocketConfig getSocketConfig() { return config; }
 
     static std::shared_ptr<TgBotSocketNative> getInstance() {
         static auto instance =
@@ -59,7 +70,7 @@ class TgBotSocketNative {
 
     static void callSuccess(JNIEnv *env, jobject callbackObj,
                             jobject resultObj) {
-        jclass callbackClass = env->FindClass(kCallbackCls.data());
+        jclass callbackClass = env->FindClass(SOCKNATIVE_CMDCB_JAVACLS);
         jmethodID success = env->GetMethodID(callbackClass, "onSuccess",
                                              "(Ljava/lang/Object;)V");
         env->CallVoidMethod(callbackObj, success, resultObj);
@@ -68,19 +79,16 @@ class TgBotSocketNative {
 
     static void callFailed(JNIEnv *env, jobject callbackObj,
                            std::string message) {
-        jclass callbackClass = env->FindClass(kCallbackCls.data());
+        jclass callbackClass = env->FindClass(SOCKNATIVE_CMDCB_JAVACLS);
         jmethodID success =
-                env->GetMethodID(callbackClass, "onError", "(Ljava/lang/String;)V");
+            env->GetMethodID(callbackClass, "onError", "(L" STRING_JAVACLS ";)V");
         env->CallVoidMethod(callbackObj, success,
                             Convert<jstring>(env, message));
         ABSL_LOG(INFO) << "Called onFailed callback";
     }
 
    private:
-    constexpr static int kSocketPort = 50000;
     constexpr static int kRecvFlags = MSG_WAITALL | MSG_NOSIGNAL;
-    static constexpr std::string_view kCallbackCls =
-            "com/royna/tgbotclient/SocketCommandNative$ICommandCallback";
     SocketConfig config;
 
     TgBotSocketNative() = default;
@@ -102,7 +110,7 @@ class TgBotSocketNative {
         int ret{};
 
         ABSL_LOG(INFO) << "Prepare to send CommandContext";
-        sockfd = socket(af, SOCK_STREAM, 0);
+        sockfd = socket(af, SOCK_STREAM | SOCK_NONBLOCK, 0);
         if (sockfd < 0) {
             _callFailed(env, callbackObj, "Failed to create socket");
             return;
@@ -111,7 +119,7 @@ class TgBotSocketNative {
         auto sockFdCloser = std::unique_ptr<int, decltype(&closeFd)>(
             &sockfd, &TgBotSocketNative::closeFd);
         ABSL_LOG(INFO) << "Using IP: " << std::quoted(config.address, '\'')
-                       << ", Port: " << kSocketPort;
+                       << ", Port: " << config.port;
         setupSockAddress(&addr);
 
         // Calculate CRC32
@@ -121,9 +129,51 @@ class TgBotSocketNative {
         context.header.checksum = crc;
 
         if (connect(sockfd, reinterpret_cast<sockaddr *>(&addr), len) != 0) {
-            _callFailed(env, callbackObj, "Failed to connect to server");
+            if (errno != EINPROGRESS) {
+                _callFailed(env, callbackObj, "Failed to initiate connect()");
+                return;
+            }
+        }
+
+        // Wait for the nonblocking socket's event...
+        struct pollfd fds{};
+        fds.events = POLLOUT;
+        fds.fd = sockfd;
+        ret = poll(&fds, 1, config.timeout_s * 1000);
+        if (ret < 0) {
+            _callFailed(env, callbackObj, "Failed to poll()");
+            return;
+        } else if (!(fds.revents & POLLOUT)) {
+            _callFailed(env, callbackObj, "The server didn't respond");
+            return;
+        }
+
+        // Get if it failed...
+        int error = 0;
+        socklen_t error_len = sizeof(error);
+        ret = getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &error, &error_len);
+        if (ret < 0) {
+            _callFailed(env, callbackObj, "Failed to getsockopt()");
+            return;
+        }
+
+        // If failed to connect, abort
+        if (error != 0) {
+            callFailed(env, callbackObj, "Failed to connect to server");
             return;
         }
+
+        ret = fcntl(sockfd, F_GETFL);
+        if (ret < 0) {
+            _callFailed(env, callbackObj, "Failed to get socket fd flags");
+            return;
+        }
+        ret = fcntl(sockfd, F_SETFL, ret & ~O_NONBLOCK);
+        if (ret < 0) {
+            _callFailed(env, callbackObj, "Failed to set socket fd blocking");
+            return;
+        }
+
         ABSL_LOG(INFO) << "Connected to server";
         ret = send(sockfd, &context.header, sizeof(PacketHeader), MSG_NOSIGNAL);
         if (ret < 0) {
@@ -200,13 +250,13 @@ class TgBotSocketNative {
     [[maybe_unused]] void setupSockAddress(sockaddr_in *addr) const {
         addr->sin_family = AF_INET;
         inet_pton(AF_INET, config.address.c_str(), &addr->sin_addr);
-        addr->sin_port = htons(kSocketPort);
+        addr->sin_port = htons(config.port);
     }
     template <>
     [[maybe_unused]] void setupSockAddress(sockaddr_in6 *addr) const {
         addr->sin6_family = AF_INET6;
         inet_pton(AF_INET6, config.address.c_str(), &addr->sin6_addr);
-        addr->sin6_port = htons(kSocketPort);
+        addr->sin6_port = htons(config.port);
     }
 
     template <Command cmd>
@@ -242,7 +292,7 @@ void initLogging(JNIEnv *env, jobject thiz) {
 }
 
 jboolean changeDestinationInfo(JNIEnv *env, jobject thiz, jstring ipaddr,
-                               jint type) {
+                               jint type, jint port) {
     auto sockIntf = TgBotSocketNative::getInstance();
     std::string newAddress = Convert<std::string>(env, ipaddr);
     SocketConfig config{};
@@ -259,12 +309,37 @@ jboolean changeDestinationInfo(JNIEnv *env, jobject thiz, jstring ipaddr,
             return false;
     }
     config.address = newAddress;
+    config.port = port;
     ABSL_LOG(INFO) << "Switched to IP " << std::quoted(newAddress, '\'')
-                   << ", af: " << type;
+                   << ", af: " << type << ", port: " << port;
     sockIntf->setSocketConfig(config);
     return true;
 }
-
+jobject getCurrentDestinationInfo(JNIEnv *env, jobject thiz) {
+    auto cf = TgBotSocketNative::getInstance()->getSocketConfig();
+    jclass info = env->FindClass(SOCKNATIVE_DSTINFO_JAVACLS);
+    jmethodID ctor = env->GetMethodID(info, "<init>",
+                                      "(L" STRING_JAVACLS
+                                      ";L" SOCKNATIVE_DSTTYPE_JAVACLS ";I)V");
+    jclass destType = env->FindClass(SOCKNATIVE_DSTTYPE_JAVACLS);
+    jmethodID valueOf =
+        env->GetStaticMethodID(destType, "valueOf",
+                               "(L" STRING_JAVACLS ";)"
+                               "L" SOCKNATIVE_DSTTYPE_JAVACLS ";");
+    jobject destTypeVal;
+    switch (cf.mode) {
+        case SocketConfig::USE_IPV4:
+            destTypeVal = env->CallStaticObjectMethod(
+                destType, valueOf, Convert<jstring>(env, "IPv4"));
+            break;
+        case SocketConfig::USE_IPV6:
+            destTypeVal = env->CallStaticObjectMethod(
+                destType, valueOf, Convert<jstring>(env, "IPv6"));
+            break;
+    }
+    return env->NewObject(info, ctor, Convert<jstring>(env, cf.address),
+                          destTypeVal, cf.port);
+}
 void sendWriteMessageToChatId(JNIEnv *env, jobject thiz, jlong chat_id,
                               jstring text, jobject callback) {
     WriteMsgToChatId data;
@@ -299,7 +374,8 @@ void downloadFile(JNIEnv *env, jobject thiz, jstring remote_file_path,
                   jstring local_file_path, jobject callback) {
     DownloadFile req{};
     copyTo(req.filepath, Convert<std::string>(env, remote_file_path).c_str());
-    copyTo(req.destfilename, Convert<std::string>(env, local_file_path).c_str());
+    copyTo(req.destfilename,
+           Convert<std::string>(env, local_file_path).c_str());
     auto pkt = Packet(Command::CMD_DOWNLOAD_FILE, req);
     TgBotSocketNative::getInstance()->sendContext(pkt, env, callback);
 }
@@ -308,19 +384,17 @@ void downloadFile(JNIEnv *env, jobject thiz, jstring remote_file_path,
 JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *__unused reserved) {
     static const JNINativeMethod methods[] = {
         NATIVE_METHOD(initLogging, "()V"),
-        NATIVE_METHOD(changeDestinationInfo, "(Ljava/lang/String;I)Z"),
+        NATIVE_METHOD(changeDestinationInfo, "(L" STRING_JAVACLS ";II)Z"),
         NATIVE_METHOD(sendWriteMessageToChatId,
-                      "(JLjava/lang/String;Lcom/royna/tgbotclient/"
-                      "SocketCommandNative$ICommandCallback;)V"),
-        NATIVE_METHOD(
-            getUptime,
-            "(Lcom/royna/tgbotclient/SocketCommandNative$ICommandCallback;)V"),
-        NATIVE_METHOD(uploadFile,
-                      "(Ljava/lang/String;Ljava/lang/String;Lcom/royna/"
-                      "tgbotclient/SocketCommandNative$ICommandCallback;)V"),
-        NATIVE_METHOD(downloadFile,
-                      "(Ljava/lang/String;Ljava/lang/String;Lcom/royna/"
-                      "tgbotclient/SocketCommandNative$ICommandCallback;)V")};
-    return JNI_onLoadDef(vm, "com/royna/tgbotclient/SocketCommandNative",
-                         methods, NATIVE_METHOD_SZ(methods));
+                      "(JL" STRING_JAVACLS ";L" SOCKNATIVE_CMDCB_JAVACLS ";)V"),
+        NATIVE_METHOD(getUptime, "(L" SOCKNATIVE_CMDCB_JAVACLS ";)V"),
+        NATIVE_METHOD(uploadFile, "(L" STRING_JAVACLS ";L" STRING_JAVACLS
+                                  ";L" SOCKNATIVE_CMDCB_JAVACLS ";)V"),
+        NATIVE_METHOD(downloadFile, "(L" STRING_JAVACLS ";L" STRING_JAVACLS
+                                    ";L" SOCKNATIVE_CMDCB_JAVACLS ";)V"),
+        NATIVE_METHOD(getCurrentDestinationInfo,
+                      "()L" SOCKNATIVE_DSTINFO_JAVACLS ";")};
+
+    return JNI_onLoadDef(vm, SOCKNATIVE_JAVACLS, methods,
+                         NATIVE_METHOD_SZ(methods));
 }
diff --git a/clientapp/android/app/src/main/java/com/royna/tgbotclient/ClientApplication.kt b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ClientApplication.kt
index 7cff92ac..54b0f428 100644
--- a/clientapp/android/app/src/main/java/com/royna/tgbotclient/ClientApplication.kt
+++ b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ClientApplication.kt
@@ -2,10 +2,15 @@ package com.royna.tgbotclient
 
 import android.app.Application
 import com.royna.tgbotclient.ui.settings.TgClientSettings
+import com.royna.tgbotclient.util.Logging
+import io.github.oshai.kotlinlogging.KLogger
+import io.github.oshai.kotlinlogging.KotlinLogging
 
 class ClientApplication : Application() {
     override fun onCreate() {
         super.onCreate()
         TgClientSettings.loadConfig(this)
+        System.setProperty("kotlin-logging-to-android-native", "true")
+        Logging.i { "Application created" }
     }
 }
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/java/com/royna/tgbotclient/MainActivity.kt b/clientapp/android/app/src/main/java/com/royna/tgbotclient/MainActivity.kt
index b189b9ed..8ed779e3 100644
--- a/clientapp/android/app/src/main/java/com/royna/tgbotclient/MainActivity.kt
+++ b/clientapp/android/app/src/main/java/com/royna/tgbotclient/MainActivity.kt
@@ -1,54 +1,34 @@
 package com.royna.tgbotclient
 
-import android.content.Context
 import android.content.Intent
-import android.content.pm.PackageManager
-import android.net.Uri
+import android.os.Build
 import android.os.Bundle
-import android.provider.Settings
 import android.view.Menu
-import android.widget.Button
-import android.widget.EditText
-import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.navigation.NavigationView
+import android.view.MenuItem
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.findNavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
-import androidx.drawerlayout.widget.DrawerLayout
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
+import com.google.android.material.navigation.NavigationView
+import com.google.android.material.snackbar.Snackbar
 import com.royna.tgbotclient.databinding.ActivityMainBinding
-import com.royna.tgbotclient.BuildConfig
-import android.Manifest
-import android.os.Build
-import android.view.MenuItem
-import android.widget.Toast
-import androidx.annotation.RequiresApi
+import com.royna.tgbotclient.pm.IStoragePermission
+import com.royna.tgbotclient.pm.StoragePermissionPreR
+import com.royna.tgbotclient.pm.StoragePermissionR
 import com.royna.tgbotclient.ui.settings.SettingsActivity
 
 class MainActivity : AppCompatActivity() {
-
     private lateinit var appBarConfiguration: AppBarConfiguration
     private lateinit var binding: ActivityMainBinding
 
-    @RequiresApi(Build.VERSION_CODES.R)
-    fun presentStoragePermission(context: Context) {
-        val uri = Uri.parse("package:${BuildConfig.APPLICATION_ID}")
-        val intent = Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION, uri)
-        when (ContextCompat.checkSelfPermission(context, Manifest.permission.MANAGE_EXTERNAL_STORAGE)) {
-            PackageManager.PERMISSION_GRANTED -> {
+    private val storagePermission : IStoragePermission =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
+            StoragePermissionR() else StoragePermissionPreR()
 
-            }
-            PackageManager.PERMISSION_DENIED -> {
-                if (shouldShowRequestPermissionRationale(Manifest.permission.MANAGE_EXTERNAL_STORAGE)) {
-                    Toast.makeText(context, "Permission Denied", Toast.LENGTH_SHORT).show()
-                    startActivity(intent)
-                }
-            }
-        }
-    }
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -56,12 +36,26 @@ class MainActivity : AppCompatActivity() {
         setContentView(binding.root)
 
         setSupportActionBar(binding.appBarMain.toolbar)
-        presentStoragePermission(this)
+        storagePermission.init(this, object : IStoragePermission.IRequestResult {
+            override fun onGranted() {
+                Toast.makeText(this@MainActivity,
+                    "Permission granted", Toast.LENGTH_SHORT).show()
+            }
+
+            override fun onDenied() {
+                Toast.makeText(this@MainActivity,
+                    "Permission denied", Toast.LENGTH_SHORT).show()
+            }
+        })
+
+        if (storagePermission.isGranted(this))
+            binding.appBarMain.fab.hide()
 
         binding.appBarMain.fab.setOnClickListener { view ->
-            Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+            Snackbar.make(view, "I need storage permission", Snackbar.LENGTH_LONG)
                 .setAction("Action", null)
                 .setAnchorView(R.id.fab).show()
+            storagePermission.request()
         }
         val drawerLayout: DrawerLayout = binding.drawerLayout
         val navView: NavigationView = binding.navView
@@ -70,7 +64,8 @@ class MainActivity : AppCompatActivity() {
         // menu should be considered as top level destinations.
         appBarConfiguration = AppBarConfiguration(
             setOf(
-                R.id.nav_home, R.id.nav_gallery, R.id.nav_slideshow
+                R.id.nav_home, R.id.nav_send_msg, R.id.nav_uptime,
+                R.id.nav_upload
             ), drawerLayout
         )
         setupActionBarWithNavController(navController, appBarConfiguration)
diff --git a/clientapp/android/app/src/main/java/com/royna/tgbotclient/SocketCommandNative.kt b/clientapp/android/app/src/main/java/com/royna/tgbotclient/SocketCommandNative.kt
index 379f0c75..cd2599bd 100644
--- a/clientapp/android/app/src/main/java/com/royna/tgbotclient/SocketCommandNative.kt
+++ b/clientapp/android/app/src/main/java/com/royna/tgbotclient/SocketCommandNative.kt
@@ -8,8 +8,8 @@ object SocketCommandNative {
         IPv4(2),
         IPv6(10)
     }
-    fun changeDestinationInfo(ipaddr: String, type: DestinationType) {
-        changeDestinationInfo(ipaddr, type.af)
+    fun changeDestinationInfo(ipaddr: String, type: DestinationType, port: Int) {
+        changeDestinationInfo(ipaddr, type.af, port)
     }
 
     interface ICommandCallback {
@@ -17,11 +17,15 @@ object SocketCommandNative {
         fun onError(error: String)
     }
 
+    data class DestinationInfo(var ipaddr: String, var type: DestinationType, var port: Int)
+
     external fun sendWriteMessageToChatId(chatId: Long, text: String, callback: ICommandCallback)
     external fun getUptime(callback: ICommandCallback)
     external fun uploadFile(path: String, destFilePath: String, callback: ICommandCallback)
     external fun downloadFile(remoteFilePath: String, localFilePath: String, callback: ICommandCallback)
-    private external fun changeDestinationInfo(ipaddr: String, type: Int) : Boolean
+    private external fun changeDestinationInfo(ipaddr: String, type: Int, port: Int) : Boolean
+    external fun getCurrentDestinationInfo() : DestinationInfo
+
     private external fun initLogging()
 
     init {
diff --git a/clientapp/android/app/src/main/java/com/royna/tgbotclient/pm/IStoragePermission.kt b/clientapp/android/app/src/main/java/com/royna/tgbotclient/pm/IStoragePermission.kt
new file mode 100644
index 00000000..8a619e37
--- /dev/null
+++ b/clientapp/android/app/src/main/java/com/royna/tgbotclient/pm/IStoragePermission.kt
@@ -0,0 +1,13 @@
+package com.royna.tgbotclient.pm
+
+import androidx.appcompat.app.AppCompatActivity
+
+interface IStoragePermission {
+    interface IRequestResult {
+        fun onGranted()
+        fun onDenied()
+    }
+    fun init(activity: AppCompatActivity, callback: IRequestResult)
+    fun request()
+    fun isGranted(activity: AppCompatActivity) : Boolean
+}
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/java/com/royna/tgbotclient/pm/StoragePermissionPreR.kt b/clientapp/android/app/src/main/java/com/royna/tgbotclient/pm/StoragePermissionPreR.kt
new file mode 100644
index 00000000..f0e6ab9a
--- /dev/null
+++ b/clientapp/android/app/src/main/java/com/royna/tgbotclient/pm/StoragePermissionPreR.kt
@@ -0,0 +1,37 @@
+package com.royna.tgbotclient.pm
+
+import android.Manifest
+import android.content.pm.PackageManager
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+
+class StoragePermissionPreR : IStoragePermission {
+    override fun init(activity: AppCompatActivity, callback: IStoragePermission.IRequestResult)  {
+        kActivityRequest = activity.registerForActivityResult(
+            ActivityResultContracts.RequestMultiplePermissions()) {
+            if (isGranted(activity)) {
+                callback.onGranted()
+            } else {
+                callback.onDenied()
+            }
+        }
+    }
+
+    override fun request() {
+        kActivityRequest.launch(kPermissionsRequested.toTypedArray())
+    }
+
+    override fun isGranted(activity: AppCompatActivity): Boolean {
+        return kPermissionsRequested.all { permission ->
+            activity.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED
+        }
+    }
+
+    private lateinit var kActivityRequest : ActivityResultLauncher<Array<String>>
+    private val kPermissionsRequested: List<String>
+        get() = listOf(
+            Manifest.permission.READ_EXTERNAL_STORAGE,
+            Manifest.permission.WRITE_EXTERNAL_STORAGE)
+
+}
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/java/com/royna/tgbotclient/pm/StoragePermissionR.kt b/clientapp/android/app/src/main/java/com/royna/tgbotclient/pm/StoragePermissionR.kt
new file mode 100644
index 00000000..72987e6d
--- /dev/null
+++ b/clientapp/android/app/src/main/java/com/royna/tgbotclient/pm/StoragePermissionR.kt
@@ -0,0 +1,38 @@
+package com.royna.tgbotclient.pm
+
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.os.Environment
+import android.provider.Settings
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.annotation.RequiresApi
+import androidx.appcompat.app.AppCompatActivity
+import com.royna.tgbotclient.BuildConfig
+
+@RequiresApi(Build.VERSION_CODES.R)
+class StoragePermissionR : IStoragePermission {
+    override fun init(activity: AppCompatActivity, callback: IStoragePermission.IRequestResult) {
+        kActivityRequest = activity.registerForActivityResult(ActivityResultContracts
+            .StartActivityForResult()) {
+            if (Environment.isExternalStorageManager()) {
+                callback.onGranted()
+            } else {
+                callback.onDenied()
+            }
+        }
+    }
+
+    override fun isGranted(activity: AppCompatActivity): Boolean {
+        return Environment.isExternalStorageManager()
+    }
+
+    override fun request() {
+        kActivityRequest.launch(Intent(
+            Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION,
+            Uri.parse("package:${BuildConfig.APPLICATION_ID}")
+        ))
+    }
+    lateinit var kActivityRequest: ActivityResultLauncher<Intent>
+}
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/CurrentSettingFragment.kt b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/CurrentSettingFragment.kt
new file mode 100644
index 00000000..5ae5b7d5
--- /dev/null
+++ b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/CurrentSettingFragment.kt
@@ -0,0 +1,48 @@
+package com.royna.tgbotclient.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.royna.tgbotclient.R
+import com.royna.tgbotclient.SocketCommandNative.getCurrentDestinationInfo
+import com.royna.tgbotclient.databinding.FragmentCurrentSettingChildBinding
+
+class CurrentSettingFragment : Fragment() {
+    private var _binding: FragmentCurrentSettingChildBinding? = null
+
+    // This property is only valid between onCreateView and
+    // onDestroyView.
+    private val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentCurrentSettingChildBinding.inflate(inflater, container, false)
+        update()
+        return binding.root
+    }
+
+    fun update () {
+        val info = getCurrentDestinationInfo()
+        binding.currentIp.text = resources.getString(R.string.ip_address_fmt,
+            info.ipaddr)
+        binding.currentPort.text = resources.getString(R.string.port_fmt,
+            info.port)
+        binding.currentType.text = resources.getString(R.string.address_type_fmt,
+            info.type.name)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    override fun onResume() {
+        super.onResume()
+        update()
+    }
+}
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/SingleViewModelBase.kt b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/SingleViewModelBase.kt
new file mode 100644
index 00000000..8dc311fc
--- /dev/null
+++ b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/SingleViewModelBase.kt
@@ -0,0 +1,27 @@
+package com.royna.tgbotclient.ui.commands
+
+import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.royna.tgbotclient.SocketCommandNative
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+
+abstract class SingleViewModelBase<T, V> : ViewModel() {
+    protected var _liveData = MutableLiveData<T>()
+    val liveData: LiveData<T> get() = _liveData
+    fun setLiveData(inval: T) {
+        _liveData.value = inval
+    }
+
+    protected val gMainScope = CoroutineScope(Dispatchers.Main)
+    abstract suspend fun coroutineFunction(activity: FragmentActivity) : V
+    abstract fun execute(activity: FragmentActivity, callback: SocketCommandNative.ICommandCallback)
+
+    override fun onCleared() {
+        super.onCleared()
+        gMainScope.cancel()
+    }
+}
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/text_to_chat/TextToChatFragment.kt b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/sendmsg/TextToChatFragment.kt
similarity index 79%
rename from clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/text_to_chat/TextToChatFragment.kt
rename to clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/sendmsg/TextToChatFragment.kt
index 2e4f8400..8e3bfd4d 100644
--- a/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/text_to_chat/TextToChatFragment.kt
+++ b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/sendmsg/TextToChatFragment.kt
@@ -1,4 +1,4 @@
-package com.royna.tgbotclient.ui.text_to_chat
+package com.royna.tgbotclient.ui.commands.sendmsg
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -9,11 +9,14 @@ import android.widget.Toast
 import androidx.core.widget.addTextChangedListener
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.commit
 import androidx.lifecycle.ViewModelProvider
-import com.royna.tgbotclient.databinding.FragmentTextToChatBinding
+import com.royna.tgbotclient.R
+import com.royna.tgbotclient.databinding.FragmentSendMessageBinding
+import com.royna.tgbotclient.ui.CurrentSettingFragment
 
 class TextToChatFragment : Fragment() {
-    private var _binding: FragmentTextToChatBinding? = null
+    private var _binding: FragmentSendMessageBinding? = null
 
     // This property is only valid between onCreateView and
     // onDestroyView.
@@ -27,7 +30,7 @@ class TextToChatFragment : Fragment() {
         val TextToChatViewModel =
             ViewModelProvider(this)[TextToChatViewModel::class.java]
 
-        _binding = FragmentTextToChatBinding.inflate(inflater, container, false)
+        _binding = FragmentSendMessageBinding.inflate(inflater, container, false)
         val root: View = binding.root
 
         val chatIdText: EditText = binding.chatIdText
@@ -70,6 +73,14 @@ class TextToChatFragment : Fragment() {
         return root
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        childFragmentManager.commit {
+            replace(R.id.current_setting_container, CurrentSettingFragment())
+        }
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
diff --git a/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/text_to_chat/TextToChatViewModel.kt b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/sendmsg/TextToChatViewModel.kt
similarity index 93%
rename from clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/text_to_chat/TextToChatViewModel.kt
rename to clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/sendmsg/TextToChatViewModel.kt
index 8407adf7..0c11c508 100644
--- a/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/text_to_chat/TextToChatViewModel.kt
+++ b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/sendmsg/TextToChatViewModel.kt
@@ -1,11 +1,8 @@
-package com.royna.tgbotclient.ui.text_to_chat
+package com.royna.tgbotclient.ui.commands.sendmsg
 
-import android.widget.Toast
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.liveData
-import androidx.lifecycle.viewModelScope
 import com.royna.tgbotclient.SocketCommandNative
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
diff --git a/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/uploadfile/UploadFileFragment.kt b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/uploadfile/UploadFileFragment.kt
new file mode 100644
index 00000000..dc6ae3cf
--- /dev/null
+++ b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/uploadfile/UploadFileFragment.kt
@@ -0,0 +1,75 @@
+package com.royna.tgbotclient.ui.commands.uploadfile
+
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.commit
+import androidx.lifecycle.ViewModelProvider
+import com.google.android.material.snackbar.Snackbar
+import com.royna.tgbotclient.R
+import com.royna.tgbotclient.SocketCommandNative
+import com.royna.tgbotclient.databinding.FragmentUploadFileBinding
+import com.royna.tgbotclient.ui.CurrentSettingFragment
+
+class UploadFileFragment : Fragment() {
+    private var _binding: FragmentUploadFileBinding? = null
+
+    // This property is only valid between onCreateView and
+    // onDestroyView.
+    private val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentUploadFileBinding.inflate(inflater, container, false)
+        val vm = ViewModelProvider(this)[UploadFileViewModel::class.java]
+        val root: View = binding.root
+        val startForResult: ActivityResultLauncher<Array<String>> =
+            registerForActivityResult(ActivityResultContracts.OpenDocument()) {
+                if (it != null) {
+                    vm.setLiveData(it.toString())
+                }
+            }
+
+        binding.uploadSelectFileButton.setOnClickListener {
+            startForResult.launch(arrayOf("*/*"))
+        }
+        binding.uploadUploadButton.setOnClickListener {
+            vm.execute(requireActivity(), object : SocketCommandNative.ICommandCallback {
+                override fun onSuccess(result: Any?) {
+                    Snackbar.make(it, "File uploaded", Snackbar.LENGTH_SHORT).show()
+                }
+
+                override fun onError(error: String) {
+                    Snackbar.make(it, "File upload failed: $error", Snackbar.LENGTH_SHORT).show()
+                }
+            })
+        }
+
+        vm.liveData.observe(viewLifecycleOwner) {
+            if (it.isNotEmpty()) {
+                binding.uploadFileView.text = it
+                binding.uploadUploadButton.isEnabled = true
+            } else {
+                binding.uploadFileView.text = resources.getString(R.string.no_file_selected)
+                binding.uploadUploadButton.isEnabled = false
+            }
+        }
+
+        return root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        childFragmentManager.commit {
+            replace(R.id.current_setting_container, CurrentSettingFragment())
+        }
+    }
+}
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/uploadfile/UploadFileViewModel.kt b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/uploadfile/UploadFileViewModel.kt
new file mode 100644
index 00000000..f97bf12f
--- /dev/null
+++ b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/uploadfile/UploadFileViewModel.kt
@@ -0,0 +1,99 @@
+package com.royna.tgbotclient.ui.commands.uploadfile
+
+import android.content.Context
+import android.net.Uri
+import android.os.Build
+import android.os.FileUtils
+import android.webkit.MimeTypeMap
+import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.royna.tgbotclient.SocketCommandNative
+import com.royna.tgbotclient.ui.commands.SingleViewModelBase
+import com.royna.tgbotclient.util.Logging
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withContext
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+
+class UploadFileViewModel : SingleViewModelBase<String, Unit>() {
+    private fun getFileExtension(context: Context, uri: Uri): String? {
+        val fileType: String? = context.contentResolver.getType(uri)
+        return MimeTypeMap.getSingleton().getExtensionFromMimeType(fileType)
+    }
+
+    @Throws(IOException::class)
+    private fun copyFileStreams(source: InputStream, target: OutputStream) {
+        val buf = ByteArray(8192)
+        var length: Int
+        while (source.read(buf).also { length = it } > 0) {
+            target.write(buf, 0, length)
+        }
+    }
+
+    override suspend fun coroutineFunction(activity: FragmentActivity) = suspendCancellableCoroutine {
+        cancellableContinuation ->
+        val contentUri = Uri.parse(liveData.value)
+        val fileExtension = getFileExtension(activity, contentUri)
+        val fileName = "temp_file" + if (fileExtension != null) ".$fileExtension" else ""
+
+        Logging.i { "Creating temporary file: $fileName" }
+
+        // Creating Temp file
+        val tempFile = File(activity.cacheDir, fileName)
+        tempFile.createNewFile()
+
+        try {
+            val oStream = FileOutputStream(tempFile)
+            activity.contentResolver.openInputStream(contentUri)?.let { stream ->
+                stream.use {
+                    if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
+                        FileUtils.copy(it, oStream)
+                    } else {
+                        copyFileStreams(it, oStream)
+                    }
+                }
+            }
+            oStream.flush()
+        } catch (e: Exception) {
+            e.printStackTrace()
+            cancellableContinuation.resumeWithException(e)
+            return@suspendCancellableCoroutine
+        }
+        SocketCommandNative.uploadFile(tempFile.absolutePath, fileName,
+            object : SocketCommandNative.ICommandCallback {
+            override fun onSuccess(result: Any?) {
+                Logging.i { "File uploaded successfully" }
+                cancellableContinuation.resume(Unit)
+            }
+
+            override fun onError(error: String) {
+                Logging.e { "File upload failed: $error" }
+                cancellableContinuation.resumeWithException(RuntimeException(error))
+            }
+        })
+    }
+    override fun execute(activity: FragmentActivity, callback: SocketCommandNative.ICommandCallback) {
+        gMainScope.launch {
+            try {
+                withContext(Dispatchers.IO){
+                    coroutineFunction(activity)
+                }
+                callback.onSuccess(null)
+            } catch (e: RuntimeException) {
+                callback.onError(e.message.toString())
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/uptime/UptimeFragment.kt b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/uptime/UptimeFragment.kt
new file mode 100644
index 00000000..537a26c4
--- /dev/null
+++ b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/uptime/UptimeFragment.kt
@@ -0,0 +1,73 @@
+package com.royna.tgbotclient.ui.commands.uptime
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.commit
+import androidx.lifecycle.ViewModelProvider
+import com.royna.tgbotclient.R
+import com.royna.tgbotclient.SocketCommandNative
+import com.royna.tgbotclient.databinding.FragmentUptimeBinding
+import com.royna.tgbotclient.ui.CurrentSettingFragment
+
+class UptimeFragment : Fragment() {
+
+    private var _binding: FragmentUptimeBinding? = null
+
+    // This property is only valid between onCreateView and
+    // onDestroyView.
+    private val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        val uptimeViewModel =
+            ViewModelProvider(this).get(UptimeViewModel::class.java)
+
+        _binding = FragmentUptimeBinding.inflate(inflater, container, false)
+        val root: View = binding.root
+
+        val textView: TextView = binding.uptimeText
+        uptimeViewModel.liveData.observe(viewLifecycleOwner) {
+            textView.text = it
+        }
+        binding.uptimeRefreshBtn.setOnClickListener {
+            binding.uptimeRefreshBtn.text = getString(R.string.get_wip)
+            binding.uptimeRefreshBtn.isEnabled = false
+            uptimeViewModel.execute(requireActivity(), object : SocketCommandNative.ICommandCallback {
+                override fun onSuccess(result: Any?) {
+                    update(result as String)
+                }
+
+                override fun onError(error: String) {
+                    update(error)
+                }
+
+                fun update(text: String) {
+                    binding.uptimeRefreshBtn.text = getString(R.string.get)
+                    binding.uptimeRefreshBtn.isEnabled = true
+                    binding.uptimeText.text = text
+                }
+            })
+        }
+        uptimeViewModel.setLiveData(getString(R.string.get_desc))
+        return root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        childFragmentManager.commit {
+            replace(R.id.current_setting_container, CurrentSettingFragment())
+        }
+    }
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/uptime/UptimeViewModel.kt b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/uptime/UptimeViewModel.kt
new file mode 100644
index 00000000..d6d65542
--- /dev/null
+++ b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/commands/uptime/UptimeViewModel.kt
@@ -0,0 +1,49 @@
+package com.royna.tgbotclient.ui.commands.uptime
+
+import androidx.fragment.app.FragmentActivity
+import com.royna.tgbotclient.R
+import com.royna.tgbotclient.SocketCommandNative
+import com.royna.tgbotclient.SocketCommandNative.getUptime
+import com.royna.tgbotclient.ui.commands.SingleViewModelBase
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withContext
+import kotlin.coroutines.resumeWithException
+
+class UptimeViewModel : SingleViewModelBase<String, String>() {
+
+    override suspend fun coroutineFunction(activity: FragmentActivity): String = suspendCancellableCoroutine {
+        getUptime(object : SocketCommandNative.ICommandCallback {
+            override fun onSuccess(result: Any?) {
+                if (result is String) {
+                    it.resumeWith(Result.success(result))
+                } else {
+                    it.resumeWithException(AssertionError("Unknown result type"))
+                }
+            }
+
+            override fun onError(error: String) {
+                it.resumeWithException(RuntimeException(error))
+            }
+        })
+    }
+    override fun execute(
+        activity: FragmentActivity,
+        callback: SocketCommandNative.ICommandCallback
+    ) {
+        gMainScope.launch {
+            val result : String
+            _liveData.postValue(activity.getString(R.string.get_wip))
+            try {
+                withContext(Dispatchers.IO) {
+                    result = coroutineFunction(activity)
+                }
+                callback.onSuccess(result)
+            } catch (e: Exception) {
+                callback.onError(e.message.toString())
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/settings/TgClientSettings.kt b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/settings/TgClientSettings.kt
index 655588b2..06ee43cb 100644
--- a/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/settings/TgClientSettings.kt
+++ b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/settings/TgClientSettings.kt
@@ -13,10 +13,12 @@ import com.royna.tgbotclient.SocketCommandNative
 
 class TgClientSettings : PreferenceFragmentCompat() {
     private lateinit var mIPAddressEditText: EditTextPreference
+    private lateinit var mPortEditText: EditTextPreference
     private lateinit var mIPv4Switch: CheckBoxPreference
     private lateinit var mIPv6Switch: CheckBoxPreference
     private var mConfig = SocketCommandNative.DestinationType.IPv4
     private var mIPAddressStr = "127.0.0.1"
+    private var mPort = 0
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.preference_main)
@@ -24,19 +26,21 @@ class TgClientSettings : PreferenceFragmentCompat() {
         mIPv4Switch = findPreference("ipv4")!!
         mIPv6Switch = findPreference("ipv6")!!
         mIPAddressEditText = findPreference("ip_address")!!
+        mPortEditText = findPreference("port_number")!!
         PreferenceManager.getDefaultSharedPreferences(requireContext()).apply {
-
             val mIPAddressStr_in = getString(kIPAddressPref, mIPAddressStr)!!
             val mConfig_in = toInetConfig(getInt(kInetConfigPref, kInet4))
-            update(mConfig_in, mIPAddressStr_in)
+            val mPort_in = getInt(kPortPref, mPort)
+
+            update(UpdateInfo(mIPAddressStr_in, mConfig_in, mPort_in), true)
         }
 
         mIPv4Switch.setOnPreferenceClickListener {
-            update(SocketCommandNative.DestinationType.IPv4)
+            update(UpdateInfo(type = SocketCommandNative.DestinationType.IPv4))
             true
         }
         mIPv6Switch.setOnPreferenceClickListener {
-            update(SocketCommandNative.DestinationType.IPv6)
+            update(UpdateInfo(type = SocketCommandNative.DestinationType.IPv6))
             true
         }
         mIPAddressEditText.setOnPreferenceChangeListener { _, newValue ->
@@ -45,26 +49,39 @@ class TgClientSettings : PreferenceFragmentCompat() {
                 Toast.makeText(context, "Invalid IP address, not saved", Toast.LENGTH_SHORT).show()
                 return@setOnPreferenceChangeListener false
             }
-            update(mNewIPAddressStr)
+            update(UpdateInfo(ipaddr = mNewIPAddressStr))
+            true
+        }
+        mPortEditText.setOnPreferenceChangeListener { _, newValue ->
+            val mNewPortStr = newValue as String
+            if (mNewPortStr.toIntOrNull() == null) {
+                Toast.makeText(context, "Invalid port number, not saved", Toast.LENGTH_SHORT).show()
+                return@setOnPreferenceChangeListener false
+            }
+            update(UpdateInfo(port=mNewPortStr.toInt()))
             true
         }
     }
 
-    private fun update(mIPAddressStr_in: String) {
-        update(mConfig, mIPAddressStr_in)
-    }
+    data class UpdateInfo(var ipaddr: String? = null,
+                          var type: SocketCommandNative.DestinationType? = null,
+                          var port: Int? = null)
 
-    private fun update(mConfig_in: SocketCommandNative.DestinationType,
-                       mIPAddressStr_in: String = mIPAddressStr) {
+    private fun update(updateInfo: UpdateInfo, force: Boolean = false) {
         var mConfigChanged = false
         var mIPAddressStrChanged = false
-        if (mConfig_in != mConfig) {
+        var mPortChanged = false
+        if (updateInfo.type?.let { updateInfo.type != mConfig || force } == true) {
             mConfigChanged = true
-            mConfig = mConfig_in
+            mConfig = updateInfo.type!!
         }
-        if (mIPAddressStr_in != mIPAddressStr) {
+        if (updateInfo.ipaddr?.let { updateInfo.ipaddr != mIPAddressStr || force } == true) {
             mIPAddressStrChanged = true
-            mIPAddressStr = mIPAddressStr_in
+            mIPAddressStr = updateInfo.ipaddr!!
+        }
+        if (updateInfo.port?.let { updateInfo.port != mPort || force } == true) {
+            mPortChanged = true
+            mPort = updateInfo.port!!
         }
         if (mConfigChanged) {
             mIPv4Switch.isChecked = mConfig == SocketCommandNative.DestinationType.IPv4
@@ -74,6 +91,9 @@ class TgClientSettings : PreferenceFragmentCompat() {
             mIPAddressEditText.text = mIPAddressStr
             mIPAddressEditText.summary = mIPAddressStr
         }
+        if (mPortChanged) {
+            mPortEditText.summary = mPort.toString()
+        }
         PreferenceManager.getDefaultSharedPreferences(requireContext()).apply {
             if (mIPAddressStrChanged) {
                 edit().putString(kIPAddressPref, mIPAddressStr).apply()
@@ -88,9 +108,12 @@ class TgClientSettings : PreferenceFragmentCompat() {
                     }
                 }
             }
+            if (mPortChanged) {
+                edit().putInt(kPortPref, mPort).apply()
+            }
         }
-        if (mConfigChanged or mIPAddressStrChanged) {
-            SocketCommandNative.changeDestinationInfo(mIPAddressStr, mConfig)
+        if (mConfigChanged or mIPAddressStrChanged or mPortChanged) {
+            SocketCommandNative.changeDestinationInfo(mIPAddressStr, mConfig, mPort)
         }
     }
     companion object {
@@ -98,6 +121,7 @@ class TgClientSettings : PreferenceFragmentCompat() {
         private val RegexIPv6 = Regex("\\b([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}\\b")
         private const val kIPAddressPref = "ip_address"
         private const val kInetConfigPref = "inet_version"
+        private const val kPortPref = "port_num"
         private const val kInet4 = 4
         private const val kInet6 = 6
         private const val kTag = "TgClientSettings"
@@ -121,7 +145,8 @@ class TgClientSettings : PreferenceFragmentCompat() {
                 val mIPAddressStr_in = getString(kIPAddressPref, "127.0.0.1")!!
                 val mConfig_in =
                     toInetConfig(getInt(kInetConfigPref, kInet4))
-                SocketCommandNative.changeDestinationInfo(mIPAddressStr_in, mConfig_in)
+                val mPort_in = getInt(kPortPref, 0)
+                SocketCommandNative.changeDestinationInfo(mIPAddressStr_in, mConfig_in, mPort_in)
             }
         }
     }
diff --git a/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/uptime/UptimeFragment.kt b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/uptime/UptimeFragment.kt
deleted file mode 100644
index c2035f2d..00000000
--- a/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/uptime/UptimeFragment.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.royna.tgbotclient.ui.uptime
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
-import com.royna.tgbotclient.SocketCommandNative
-import com.royna.tgbotclient.SocketCommandNative.getUptime
-import com.royna.tgbotclient.databinding.FragmentUptimeBinding
-
-class UptimeFragment : Fragment() {
-
-    private var _binding: FragmentUptimeBinding? = null
-
-    // This property is only valid between onCreateView and
-    // onDestroyView.
-    private val binding get() = _binding!!
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        val uptimeViewModel =
-            ViewModelProvider(this).get(UptimeViewModel::class.java)
-
-        _binding = FragmentUptimeBinding.inflate(inflater, container, false)
-        val root: View = binding.root
-
-        val textView: TextView = binding.uptimeText
-        uptimeViewModel.uptimeText.observe(viewLifecycleOwner) {
-            textView.text = it
-        }
-        binding.uptimeRefreshBtn.setOnClickListener {
-            uptimeViewModel.send()
-        }
-        return root
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/uptime/UptimeViewModel.kt b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/uptime/UptimeViewModel.kt
deleted file mode 100644
index f1ae1256..00000000
--- a/clientapp/android/app/src/main/java/com/royna/tgbotclient/ui/uptime/UptimeViewModel.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.royna.tgbotclient.ui.uptime
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import com.royna.tgbotclient.SocketCommandNative
-import com.royna.tgbotclient.SocketCommandNative.getUptime
-
-class UptimeViewModel : ViewModel() {
-    private var _uptimeText = MutableLiveData<String>().apply {
-        value = ""
-    }
-    val uptimeText: LiveData<String> get() = _uptimeText
-
-    fun send() {
-        getUptime(object : SocketCommandNative.ICommandCallback {
-            override fun onSuccess(result: Any?) {
-                if (result is String) {
-                    _uptimeText.value = result
-                }
-            }
-
-            override fun onError(error: String) {
-                _uptimeText.value = error
-            }
-        })
-    }
-}
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/java/com/royna/tgbotclient/util/Logging.kt b/clientapp/android/app/src/main/java/com/royna/tgbotclient/util/Logging.kt
new file mode 100644
index 00000000..93f0876a
--- /dev/null
+++ b/clientapp/android/app/src/main/java/com/royna/tgbotclient/util/Logging.kt
@@ -0,0 +1,41 @@
+package com.royna.tgbotclient.util
+
+import com.royna.tgbotclient.BuildConfig
+import io.github.oshai.kotlinlogging.KotlinLogging
+
+object Logging {
+    private const val TAG = "TGBotCli::APP"
+    private val DEBUG = BuildConfig.DEBUG
+    fun i(fn: logFunctionT) {
+        KotlinLogging.logger(getCaller()).info(fn)
+    }
+
+    fun e(fn: logFunctionT) {
+        KotlinLogging.logger(getCaller()).error(fn)
+    }
+
+    fun w(fn: logFunctionT) {
+        KotlinLogging.logger(getCaller()).warn(fn)
+    }
+
+    fun d(fn: logFunctionT) {
+        if (DEBUG) {
+            KotlinLogging.logger(getCaller()).debug(fn)
+        }
+    }
+
+    private fun getCaller(): String {
+        val element = Thread.currentThread().stackTrace[4]
+        var className = element.className.replace("$", "_")
+        while (className.endsWith("_")) {
+            className = className.substring(0, className.length - 1)
+        }
+        return String.format(
+            "%s %s",
+            className.substring(className.lastIndexOf(".") + 1),
+            element.methodName.substringBefore("-")
+        )
+    }
+}
+
+typealias logFunctionT = () -> Any?
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/res/drawable/black_border.xml b/clientapp/android/app/src/main/res/drawable/black_border.xml
deleted file mode 100644
index 383223d6..00000000
--- a/clientapp/android/app/src/main/res/drawable/black_border.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <stroke
-        android:width="2dp"
-        android:color="#000000"/>
-</shape>
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/res/drawable/border.xml b/clientapp/android/app/src/main/res/drawable/border.xml
new file mode 100644
index 00000000..0e1d4d43
--- /dev/null
+++ b/clientapp/android/app/src/main/res/drawable/border.xml
@@ -0,0 +1,13 @@
+<!-- res/drawable/border.xml -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#FFFFFF" /> <!-- Background color -->
+    <stroke
+        android:width="2dp"
+        android:color="#000000" /> <!-- Border width and color -->
+    <padding
+        android:left="4dp"
+        android:top="4dp"
+        android:right="4dp"
+        android:bottom="4dp" /> <!-- Padding inside the border -->
+    <corners android:radius="4dp" /> <!-- Corner radius -->
+</shape>
diff --git a/clientapp/android/app/src/main/res/drawable/chat.xml b/clientapp/android/app/src/main/res/drawable/chat.xml
new file mode 100644
index 00000000..63b53069
--- /dev/null
+++ b/clientapp/android/app/src/main/res/drawable/chat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M240,560h320v-80L240,480v80ZM240,440h480v-80L240,360v80ZM240,320h480v-80L240,240v80ZM80,880v-720q0,-33 23.5,-56.5T160,80h640q33,0 56.5,23.5T880,160v480q0,33 -23.5,56.5T800,720L240,720L80,880ZM206,640h594v-480L160,160v525l46,-45ZM160,640v-480,480Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/clientapp/android/app/src/main/res/drawable/download.xml b/clientapp/android/app/src/main/res/drawable/download.xml
new file mode 100644
index 00000000..24d4a8d7
--- /dev/null
+++ b/clientapp/android/app/src/main/res/drawable/download.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M480,640 L280,440l56,-58 104,104v-326h80v326l104,-104 56,58 -200,200ZM240,800q-33,0 -56.5,-23.5T160,720v-120h80v120h480v-120h80v120q0,33 -23.5,56.5T720,800L240,800Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/clientapp/android/app/src/main/res/drawable/home.xml b/clientapp/android/app/src/main/res/drawable/home.xml
new file mode 100644
index 00000000..3e521bbd
--- /dev/null
+++ b/clientapp/android/app/src/main/res/drawable/home.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M240,760h120v-240h240v240h120v-360L480,220 240,400v360ZM160,840v-480l320,-240 320,240v480L520,840v-240h-80v240L160,840ZM480,490Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/clientapp/android/app/src/main/res/drawable/ic_menu_camera.xml b/clientapp/android/app/src/main/res/drawable/ic_menu_camera.xml
deleted file mode 100644
index 634fe922..00000000
--- a/clientapp/android/app/src/main/res/drawable/ic_menu_camera.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9,2L7.17,4H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2H9zm3,15c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z" />
-</vector>
diff --git a/clientapp/android/app/src/main/res/drawable/ic_menu_gallery.xml b/clientapp/android/app/src/main/res/drawable/ic_menu_gallery.xml
deleted file mode 100644
index 03c77099..00000000
--- a/clientapp/android/app/src/main/res/drawable/ic_menu_gallery.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M22,16V4c0,-1.1 -0.9,-2 -2,-2H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zm-11,-4l2.03,2.71L16,11l4,5H8l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2H4V6H2z" />
-</vector>
diff --git a/clientapp/android/app/src/main/res/drawable/ic_menu_slideshow.xml b/clientapp/android/app/src/main/res/drawable/ic_menu_slideshow.xml
deleted file mode 100644
index 5e9e163a..00000000
--- a/clientapp/android/app/src/main/res/drawable/ic_menu_slideshow.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6zm16,-4H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zm-8,12.5v-9l6,4.5 -6,4.5z" />
-</vector>
diff --git a/clientapp/android/app/src/main/res/drawable/schedule.xml b/clientapp/android/app/src/main/res/drawable/schedule.xml
new file mode 100644
index 00000000..8855cd49
--- /dev/null
+++ b/clientapp/android/app/src/main/res/drawable/schedule.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="m612,668 l56,-56 -148,-148v-184h-80v216l172,172ZM480,880q-83,0 -156,-31.5T197,763q-54,-54 -85.5,-127T80,480q0,-83 31.5,-156T197,197q54,-54 127,-85.5T480,80q83,0 156,31.5T763,197q54,54 85.5,127T880,480q0,83 -31.5,156T763,763q-54,54 -127,85.5T480,880ZM480,480ZM480,800q133,0 226.5,-93.5T800,480q0,-133 -93.5,-226.5T480,160q-133,0 -226.5,93.5T160,480q0,133 93.5,226.5T480,800Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/clientapp/android/app/src/main/res/drawable/send.xml b/clientapp/android/app/src/main/res/drawable/send.xml
new file mode 100644
index 00000000..199a1262
--- /dev/null
+++ b/clientapp/android/app/src/main/res/drawable/send.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M120,800v-640l760,320 -760,320ZM200,680 L674,480 200,280v140l240,60 -240,60v140ZM200,680v-400,400Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/clientapp/android/app/src/main/res/drawable/side_nav_bar.xml b/clientapp/android/app/src/main/res/drawable/side_nav_bar.xml
index a6c0ccc8..3b6ffab3 100644
--- a/clientapp/android/app/src/main/res/drawable/side_nav_bar.xml
+++ b/clientapp/android/app/src/main/res/drawable/side_nav_bar.xml
@@ -1,9 +1,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <gradient
-        android:angle="135"
-        android:centerColor="#739CCD"
-        android:endColor="#2CDC28"
-        android:startColor="#4DB6AC"
-        android:type="linear" />
+        android:angle="315"
+        android:startColor="@color/ic_launcher_background"
+        android:endColor="@android:color/white"
+        android:type="linear"/>
 </shape>
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/res/drawable/upload.xml b/clientapp/android/app/src/main/res/drawable/upload.xml
new file mode 100644
index 00000000..8d997d1f
--- /dev/null
+++ b/clientapp/android/app/src/main/res/drawable/upload.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M440,640v-326L336,418l-56,-58 200,-200 200,200 -56,58 -104,-104v326h-80ZM240,800q-33,0 -56.5,-23.5T160,720v-120h80v120h480v-120h80v120q0,33 -23.5,56.5T720,800L240,800Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/clientapp/android/app/src/main/res/layout/fragment_current_setting.xml b/clientapp/android/app/src/main/res/layout/fragment_current_setting.xml
new file mode 100644
index 00000000..10e58589
--- /dev/null
+++ b/clientapp/android/app/src/main/res/layout/fragment_current_setting.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/current_setting_container"
+    android:background="@drawable/border">
+
+</FrameLayout>
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/res/layout/fragment_current_setting_child.xml b/clientapp/android/app/src/main/res/layout/fragment_current_setting_child.xml
new file mode 100644
index 00000000..37101848
--- /dev/null
+++ b/clientapp/android/app/src/main/res/layout/fragment_current_setting_child.xml
@@ -0,0 +1,36 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="10dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/current_title"
+        android:layout_centerHorizontal="true"
+        android:textStyle="bold"
+        android:layout_marginBottom="10dp"
+        android:text="@string/current_config"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/current_ip"
+        android:layout_below="@id/current_title"
+        android:layout_centerHorizontal="true"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/current_type"
+        android:layout_centerHorizontal="true"
+        android:layout_below="@id/current_ip"
+        android:layout_margin="10dp"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/current_port"
+        android:layout_centerHorizontal="true"
+        android:layout_below="@id/current_type"/>
+</RelativeLayout>
diff --git a/clientapp/android/app/src/main/res/layout/fragment_text_to_chat.xml b/clientapp/android/app/src/main/res/layout/fragment_send_message.xml
similarity index 69%
rename from clientapp/android/app/src/main/res/layout/fragment_text_to_chat.xml
rename to clientapp/android/app/src/main/res/layout/fragment_send_message.xml
index 0fcc278e..46a6def9 100644
--- a/clientapp/android/app/src/main/res/layout/fragment_text_to_chat.xml
+++ b/clientapp/android/app/src/main/res/layout/fragment_send_message.xml
@@ -9,7 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/destination_chat"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="@dimen/padding_small"
         android:layout_centerHorizontal="true" />
 
     <EditText
@@ -17,8 +17,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/showChatIdText"
-        android:layout_marginTop="8dp"
-        android:layout_marginHorizontal="30dp"
+        android:layout_marginTop="@dimen/padding_small"
+        android:layout_marginHorizontal="@dimen/padding_medium"
         android:inputType="numberSigned"
         android:hint="@string/chat_id" />
 
@@ -29,7 +29,7 @@
         android:layout_height="wrap_content"
         android:text="@string/message_text"
         android:layout_below="@id/chatIdText"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="@dimen/padding_small"
         android:layout_centerHorizontal="true" />
 
     <EditText
@@ -37,8 +37,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/showMessageText"
-        android:layout_marginTop="8dp"
-        android:layout_marginHorizontal="30dp"
+        android:layout_marginHorizontal="@dimen/padding_medium"
+        android:layout_marginTop="@dimen/padding_small"
         android:hint="@string/text" />
 
     <!-- Button -->
@@ -48,6 +48,14 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/messageText"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="@dimen/padding_medium"
         android:text="@string/send_message" />
+
+    <include
+        layout="@layout/fragment_current_setting"
+        android:layout_alignParentBottom="true"
+        android:layout_margin="@dimen/padding_medium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/res/layout/fragment_upload_file.xml b/clientapp/android/app/src/main/res/layout/fragment_upload_file.xml
new file mode 100644
index 00000000..576dd811
--- /dev/null
+++ b/clientapp/android/app/src/main/res/layout/fragment_upload_file.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.commands.uploadfile.UploadFileFragment">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/padding_small"
+        android:textAlignment="center"
+        android:id="@+id/upload_file_view"/>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/upload_file_view"
+        android:layout_centerInParent="true"
+        android:id="@+id/upload_buttons_container"
+        style="?android:attr/buttonBarStyle">
+
+        <Button
+            android:id="@+id/upload_select_file_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/padding_medium"
+            style="?android:attr/buttonBarButtonStyle"
+            android:text="@string/select_file" />
+
+        <Button
+            android:id="@+id/upload_upload_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/padding_medium"
+            style="?android:attr/buttonBarButtonStyle"
+            android:text="@string/upload_file" />
+
+    </LinearLayout>
+
+    <include
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_alignParentBottom="true"
+        android:layout_margin="@dimen/padding_medium"
+        layout="@layout/fragment_current_setting" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/res/layout/fragment_uptime.xml b/clientapp/android/app/src/main/res/layout/fragment_uptime.xml
index 8e0fe67f..d8de63b9 100644
--- a/clientapp/android/app/src/main/res/layout/fragment_uptime.xml
+++ b/clientapp/android/app/src/main/res/layout/fragment_uptime.xml
@@ -3,15 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.uptime.UptimeFragment">
+    tools:context=".ui.commands.uptime.UptimeFragment">
 
     <TextView
         android:id="@+id/uptimeText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
+        android:layout_margin="@dimen/padding_small"
         android:textAlignment="center"
         android:textSize="20sp"/>
 
@@ -19,8 +17,15 @@
         android:id="@+id/uptimeRefreshBtn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Button"
+        android:text="@string/get"
         android:layout_centerHorizontal="true"
         android:layout_below="@id/uptimeText"/>
 
+    <include
+        layout="@layout/fragment_current_setting"
+        android:layout_alignParentBottom="true"
+        android:layout_margin="@dimen/padding_medium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/res/menu/activity_main_drawer.xml b/clientapp/android/app/src/main/res/menu/activity_main_drawer.xml
index 09b1b82e..d732be84 100644
--- a/clientapp/android/app/src/main/res/menu/activity_main_drawer.xml
+++ b/clientapp/android/app/src/main/res/menu/activity_main_drawer.xml
@@ -6,15 +6,40 @@
     <group android:checkableBehavior="single">
         <item
             android:id="@+id/nav_home"
-            android:icon="@drawable/ic_menu_camera"
+            android:icon="@drawable/home"
             android:title="@string/menu_home" />
-        <item
-            android:id="@+id/nav_gallery"
-            android:icon="@drawable/ic_menu_gallery"
-            android:title="@string/menu_send_text_to_chat" />
-        <item
-            android:id="@+id/nav_slideshow"
-            android:icon="@drawable/ic_menu_slideshow"
-            android:title="@string/menu_get_uptime" />
+
+        <item android:title="@string/menu_commands">
+            <menu>
+                <group android:checkableBehavior="single">
+                    <item
+                        android:id="@+id/nav_send_msg"
+                        android:icon="@drawable/send"
+                        android:title="@string/menu_send_text_to_chat" />
+                    <item
+                        android:id="@+id/nav_uptime"
+                        android:icon="@drawable/schedule"
+                        android:title="@string/menu_get_uptime" />
+                    <item
+                        android:id="@+id/nav_upload"
+                        android:icon="@drawable/upload"
+                        android:title="@string/menu_upload_file" />
+                    <item
+                        android:id="@+id/nav_download"
+                        android:icon="@drawable/download"
+                        android:title="@string/menu_download_file" />
+                </group>
+            </menu>
+        </item>
+        <item android:title="@string/utilities">
+            <menu>
+                <group android:checkableBehavior="single">
+                    <item
+                        android:id="@+id/nav_chat_id"
+                        android:icon="@drawable/chat"
+                        android:title="@string/menu_chat_id_save" />
+                </group>
+            </menu>
+        </item>
     </group>
 </menu>
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/res/menu/main.xml b/clientapp/android/app/src/main/res/menu/main.xml
index 412d5f84..ce105fef 100644
--- a/clientapp/android/app/src/main/res/menu/main.xml
+++ b/clientapp/android/app/src/main/res/menu/main.xml
@@ -6,4 +6,5 @@
         android:orderInCategory="100"
         android:title="@string/action_settings"
         app:showAsAction="never" />
+
 </menu>
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/res/navigation/mobile_navigation.xml b/clientapp/android/app/src/main/res/navigation/mobile_navigation.xml
index 95b4a97f..0a67dbe3 100644
--- a/clientapp/android/app/src/main/res/navigation/mobile_navigation.xml
+++ b/clientapp/android/app/src/main/res/navigation/mobile_navigation.xml
@@ -12,14 +12,20 @@
         tools:layout="@layout/fragment_home" />
 
     <fragment
-        android:id="@+id/nav_gallery"
-        android:name="com.royna.tgbotclient.ui.text_to_chat.TextToChatFragment"
+        android:id="@+id/nav_send_msg"
+        android:name="com.royna.tgbotclient.ui.commands.sendmsg.TextToChatFragment"
         android:label="@string/menu_send_text_to_chat"
-        tools:layout="@layout/fragment_text_to_chat" />
+        tools:layout="@layout/fragment_send_message" />
 
     <fragment
-        android:id="@+id/nav_slideshow"
-        android:name="com.royna.tgbotclient.ui.uptime.UptimeFragment"
+        android:id="@+id/nav_uptime"
+        android:name="com.royna.tgbotclient.ui.commands.uptime.UptimeFragment"
         android:label="@string/menu_get_uptime"
         tools:layout="@layout/fragment_uptime" />
+
+    <fragment
+        android:id="@+id/nav_upload"
+        android:name="com.royna.tgbotclient.ui.commands.uploadfile.UploadFileFragment"
+        android:label="@string/menu_upload_file"
+        tools:layout="@layout/fragment_upload_file" />
 </navigation>
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/res/values/dimens.xml b/clientapp/android/app/src/main/res/values/dimens.xml
index 4ab4520f..b1aff327 100644
--- a/clientapp/android/app/src/main/res/values/dimens.xml
+++ b/clientapp/android/app/src/main/res/values/dimens.xml
@@ -5,4 +5,7 @@
     <dimen name="nav_header_vertical_spacing">8dp</dimen>
     <dimen name="nav_header_height">176dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
+    <dimen name="padding_small">10dp</dimen>
+    <dimen name="padding_medium">20dp</dimen>
+    <dimen name="padding_large">40dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/res/values/strings.xml b/clientapp/android/app/src/main/res/values/strings.xml
index 19e7d19b..b1f8571e 100644
--- a/clientapp/android/app/src/main/res/values/strings.xml
+++ b/clientapp/android/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="title_activity_main">MainActivity</string>
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
-    <string name="nav_header_title">Android Studio</string>
+    <string name="nav_header_title">TgBot++ Client</string>
     <string name="nav_header_subtitle">android.studio@android.com</string>
     <string name="nav_header_desc">Navigation header</string>
     <string name="action_settings">Settings</string>
@@ -16,4 +16,19 @@
     <string name="message_text">Message Text</string>
     <string name="text">Text</string>
     <string name="send_message">Send Message</string>
+    <string name="current_config">Current Configuration</string>
+    <string name="ip_address_fmt">IP Address: %s</string>
+    <string name="address_type_fmt">Address Type: %s</string>
+    <string name="port_fmt">Port: %d</string>
+    <string name="menu_commands">Commands</string>
+    <string name="menu_upload_file">Upload file</string>
+    <string name="menu_download_file">Download File</string>
+    <string name="menu_chat_id_save">Save chat id</string>
+    <string name="utilities">Utilities</string>
+    <string name="get">Get</string>
+    <string name="get_desc">Press the get button</string>
+    <string name="get_wip">Getting…</string>
+    <string name="select_file">Select File</string>
+    <string name="no_file_selected">No file selected</string>
+    <string name="upload_file">Upload File</string>
 </resources>
\ No newline at end of file
diff --git a/clientapp/android/app/src/main/res/xml/preference_main.xml b/clientapp/android/app/src/main/res/xml/preference_main.xml
index 177c525b..4037012e 100644
--- a/clientapp/android/app/src/main/res/xml/preference_main.xml
+++ b/clientapp/android/app/src/main/res/xml/preference_main.xml
@@ -7,6 +7,11 @@
         <EditTextPreference
             android:title="IP Address"
             android:key="ip_address"/>
+        <EditTextPreference
+            android:title="Port number"
+            android:key="port_number"
+            android:defaultValue="50000"
+            android:inputType="number"/>
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/clientapp/android/gradle/libs.versions.toml b/clientapp/android/gradle/libs.versions.toml
index 9bb1bd67..d34369ed 100644
--- a/clientapp/android/gradle/libs.versions.toml
+++ b/clientapp/android/gradle/libs.versions.toml
@@ -1,11 +1,12 @@
 [versions]
-agp = "8.4.1"
+agp = "8.4.2"
 kotlin = "1.9.0"
 coreKtx = "1.10.1"
 junit = "4.13.2"
 junitVersion = "1.1.5"
 espressoCore = "3.5.1"
 appcompat = "1.6.1"
+kotlinLoggingJvmVersion = "5.1.0"
 material = "1.10.0"
 activity = "1.8.0"
 constraintlayout = "2.1.4"
@@ -15,6 +16,9 @@ navigationFragmentKtx = "2.6.0"
 navigationUiKtx = "2.6.0"
 preferenceKtx = "1.2.1"
 preference = "1.2.0"
+legacySupportV4 = "1.0.0"
+fragmentKtx = "1.5.6"
+slf4jSimple = "2.0.3"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -31,6 +35,10 @@ androidx-navigation-fragment-ktx = { group = "androidx.navigation", name = "navi
 androidx-navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigationUiKtx" }
 androidx-preference-ktx = { group = "androidx.preference", name = "preference-ktx", version.ref = "preferenceKtx" }
 androidx-preference = { group = "androidx.preference", name = "preference", version.ref = "preference" }
+androidx-legacy-support-v4 = { group = "androidx.legacy", name = "legacy-support-v4", version.ref = "legacySupportV4" }
+androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragmentKtx" }
+oshai-kotlin-logging-jvm = { module = "io.github.oshai:kotlin-logging-jvm", version.ref = "kotlinLoggingJvmVersion" }
+slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4jSimple" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
diff --git a/src/socket/include/TgBotSocket_Export.hpp b/src/socket/include/TgBotSocket_Export.hpp
index 92a05a8f..89d5df38 100644
--- a/src/socket/include/TgBotSocket_Export.hpp
+++ b/src/socket/include/TgBotSocket_Export.hpp
@@ -55,7 +55,7 @@ enum class Command : std::int32_t {
  */
  
 struct TGSOCKET_ATTR_PACKED PacketHeader {
-    using length_type = size_t;
+    using length_type = uint64_t;
     constexpr static int64_t MAGIC_VALUE_BASE = 0xDEADFACE;
     // Version number, to be increased on breaking changes
     // 1: Initial version
@@ -63,7 +63,6 @@ struct TGSOCKET_ATTR_PACKED PacketHeader {
     // 3: Uploadfile has a sha256sum check, std::array conversions
     // 4: Move CMD_UPLOAD_FILE_DRY to internal namespace
     // 5: Use the packed attribute for structs
-    // 6: Use size_t for length_type
     constexpr static int DATA_VERSION = 5;
     constexpr static int64_t MAGIC_VALUE = MAGIC_VALUE_BASE + DATA_VERSION;
 
diff --git a/src/socket/interface/impl/bot/TgBotSocketFileHelper.hpp b/src/socket/interface/impl/bot/TgBotSocketFileHelper.hpp
index e73fc9e2..13d20763 100644
--- a/src/socket/interface/impl/bot/TgBotSocketFileHelper.hpp
+++ b/src/socket/interface/impl/bot/TgBotSocketFileHelper.hpp
@@ -20,7 +20,7 @@ inline void copyTo(std::array<char, size>& arr_in, const char* buf) {
 }
 
 namespace FileDataHelper {
-using len_t = uint64_t;
+using len_t = TgBotSocket::PacketHeader::length_type;
 using RAIIMalloc = std::unique_ptr<void, decltype(&free)>;
 
 enum Pass {