From 340833ea7bc8b631c5079e4613585fb47a2762a9 Mon Sep 17 00:00:00 2001
From: Iaphetes <iaphetes@mailfence.com>
Date: Tue, 19 Nov 2024 07:49:53 +0100
Subject: [PATCH] working android example. File access still not working

---
 .gitignore                                    |  2 +-
 src-tauri/capabilities/default.json           | 10 +++++--
 src-tauri/gen/android/app/build.gradle.kts    | 20 ++++++++++++-
 .../android/app/src/main/AndroidManifest.xml  |  2 ++
 src-tauri/tauri.conf.json                     |  3 +-
 src/main.js                                   | 30 +++++++++++--------
 6 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index a547bf3..de05ff2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,7 @@ node_modules
 dist
 dist-ssr
 *.local
-
+src-tauri/gen/android/keystore.properties
 # Editor directories and files
 .vscode/*
 !.vscode/extensions.json
diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json
index 0170c2a..db22fd6 100644
--- a/src-tauri/capabilities/default.json
+++ b/src-tauri/capabilities/default.json
@@ -6,9 +6,15 @@
     "main"
   ],
   "permissions": [
+    {
+      "identifier": "fs:allow-read",
+      "allow": [{ "path": "$HOME/**" }]
+    },
     "core:default",
     "shell:allow-open",
-    "fs:default",
-    "log:default"
+    "log:default",
+    "fs:allow-home-read-recursive",
+    "fs:scope-home-recursive",
+    "fs:read-all"
   ]
 }
diff --git a/src-tauri/gen/android/app/build.gradle.kts b/src-tauri/gen/android/app/build.gradle.kts
index ea31864..dabf31d 100644
--- a/src-tauri/gen/android/app/build.gradle.kts
+++ b/src-tauri/gen/android/app/build.gradle.kts
@@ -1,4 +1,5 @@
 import java.util.Properties
+import java.io.FileInputStream
 
 plugins {
     id("com.android.application")
@@ -24,6 +25,22 @@ android {
         versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
         versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
     }
+    signingConfigs {
+        create("release") {
+            val keystorePropertiesFile = rootProject.file("keystore.properties")
+            val keystoreProperties = Properties()
+            if (keystorePropertiesFile.exists()) {
+                keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+            }
+
+            keyAlias = keystoreProperties["keyAlias"] as String
+            keyPassword = keystoreProperties["password"] as String
+            storeFile = file(keystoreProperties["storeFile"] as String)
+            storePassword = keystoreProperties["password"] as String
+        }
+    }
+
+
     buildTypes {
         getByName("debug") {
             manifestPlaceholders["usesCleartextTraffic"] = "true"
@@ -37,6 +54,7 @@ android {
             }
         }
         getByName("release") {
+            signingConfig = signingConfigs.getByName("release")
             isMinifyEnabled = true
             proguardFiles(
                 *fileTree(".") { include("**/*.pro") }
@@ -66,4 +84,4 @@ dependencies {
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0")
 }
 
-apply(from = "tauri.build.gradle.kts")
\ No newline at end of file
+apply(from = "tauri.build.gradle.kts")
diff --git a/src-tauri/gen/android/app/src/main/AndroidManifest.xml b/src-tauri/gen/android/app/src/main/AndroidManifest.xml
index 40bcd28..13e2334 100644
--- a/src-tauri/gen/android/app/src/main/AndroidManifest.xml
+++ b/src-tauri/gen/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <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" />
 
     <!-- AndroidTV support -->
     <uses-feature android:name="android.software.leanback" android:required="false" />
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 312ca34..046d436 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -20,7 +20,8 @@
       "assetProtocol": {
         "enable": true,
         "scope": [
-					"$HOME/**"
+					"$HOME/**",
+					"**"
 				]
       }
 
diff --git a/src/main.js b/src/main.js
index 137ccac..2cee64c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,4 +1,5 @@
 const { convertFileSrc, invoke } = window.__TAURI__.core;
+// const {  invoke } = window.__TAURI__.core;
 const { homeDir, join } = window.__TAURI__.path;
 const { readFile } = window.__TAURI__.fs;
 
@@ -7,20 +8,25 @@ const filePath = await join(appDataDirPath, 'Pictures/wallpaper.png');
 
 const assetUrl = convertFileSrc(filePath);
 
-
 let text = "";
-window.addEventListener("DOMCharacterDataModified", () => {
+// window.addEventListener("DOMCharacterDataModified", () => {
+  // var tag_id = document.getElementById('rendered_markdown');
+  // tag_id.innerHTML = "<p>HI</p>"
 // window.addEventListener("DOMContentLoaded", () => {
-  let textarea = document.getElementById('markdown_input');
-  textarea.addEventListener('input', ()=> {
+let textarea = document.getElementById('markdown_input');
+textarea.addEventListener('input', ()=> {
     text = textarea.innerText;
-    invoke("parse_markdown", { document: text }).then(
-      (ret)=>{    
-        var tag_id = document.getElementById('rendered_markdown');
-        // tag_id.innerHTML = "<pre>".concat("", ret).concat("", "</pre>");
-        tag_id.innerHTML = assetUrl.concat(" ", ' \n <img src="'.concat("", assetUrl).concat("", '" alt="Girl in a jacket" width="500" height="600">'))
-      }
-    );
+    var tag_id = document.getElementById('rendered_markdown');
+    tag_id.innerHTML = "<p>HI</p>"
+  // invoke("parse_markdown", { document: text }).then(
+  //   (ret)=>{    
+  //     var tag_id = document.getElementById('rendered_markdown');
+  //     // tag_id.innerHTML = assetUrl.concat(" ", ' \n <img src="'.concat("", assetUrl).concat("", '" alt="Girl in a jacket" width="500" height="600">'))
+      // tag_id.innerHTML = "<p>HI</p>"
+  //     // tag_id.innerHTML = "<pre>".concat("", ret).concat("", "</pre>");
+      tag_id.innerHTML = assetUrl.concat(" ", ' \n <img src="'.concat("", assetUrl).concat("", '" alt="Girl in a jacket" width="500" height="600">'))
+  //   }
+  // );
 
-  });
+// });
 });