Merge branch 'master' of https://github.com/Novfensec/KvDeveloper-Client

Author: Novfensec

client/buildozer.spec

@@ -145,11 +145,11 @@ android.minapi = 23
 android.accept_sdk_license = True
 
 # (str) Android entry point, default is ok for Kivy-based app
-android.entrypoint = org.kvdeveloper.client.ApplicationActivity
+# android.entrypoint = org.kvdeveloper.client.ApplicationActivity
 
 # (str) Full name including package path of the Java class that implements Android Activity
 # use that parameter together with android.entrypoint to set custom Java class instead of PythonActivity
-android.activity_class_name = org.kvdeveloper.client.ApplicationActivity
+# android.activity_class_name = org.kvdeveloper.client.ApplicationActivity
 
 # (str) Extra xml to write directly inside the <manifest> element of AndroidManifest.xml
 # use that parameter to provide a filename from where to load your custom XML code:

client/libs/installer/__init__.py

@@ -10,9 +10,9 @@
     from jnius import autoclass
     from libs.utils import request_android_permissions, Permission
 
-    ApplicationActivity = autoclass("org.kvdeveloper.client.ApplicationActivity")
+    PythonActivity = autoclass("org.kivy.android.PythonActivity")
 
-    install_dir = ApplicationActivity.install_dir
+    install_dir = os.path.join(PythonActivity.mActivity.getFilesDir().getAbsolutePath(), "Applications", "site-packages")
 
 else:
     install_dir = os.path.expanduser("~/Applications/site-packages")

client/libs/launcher/android/__init__.py

@@ -2,7 +2,7 @@
 from jnius import autoclass
 from android.runnable import run_on_ui_thread  # type: ignore
 
-ApplicationActivity = autoclass("org.kvdeveloper.client.ApplicationActivity")
+ApplicationActivity = autoclass("org.kivy.android.PythonActivity")
 ClientActivity = autoclass("org.kvdeveloper.client.ClientActivity")
 Intent = autoclass("android.content.Intent")
 Uri = autoclass("android.net.Uri")

client/src/org/kvdeveloper/client/ClientActivity.java

@@ -5,9 +5,9 @@
 import android.util.Log;
 import android.view.KeyEvent;
 
-import org.kvdeveloper.client.ApplicationActivity;
+import org.kivy.android.PythonActivity;
 
-public class ClientActivity extends ApplicationActivity {
+public class ClientActivity extends PythonActivity {
     private static final String TAG = "ClientActivity";
 
     @Override
@@ -21,7 +21,7 @@ public String getEntryPoint(String searchDir) {
         Uri uri = getIntent().getData();
         if (uri != null) {
             String path = uri.getPath();
-            Log.i(TAG, "Launching entrypoint from URI: " + path);
+            Log.i(TAG, "Will launch entrypoint from URI: " + path);
             return path;
         } else {
             Log.w(TAG, "No entrypoint URI passed.");