Update 1.0.2 | Final update

CHANGELOG.md

@@ -1,3 +1,8 @@
+# Version 1.1.0:
+- **Patch**: Fixed app crashes caused by the swipe to refresh layout.
+- **Patch**: Fixed image upload feature.
+- **Patch**: Updated dependencies to the latest versions.
+
 # Version 1.0.2:
 - **Patch**: Fixed issue with Build CI on GitHub.
 

app/build.gradle.kts

@@ -52,8 +52,7 @@ dependencies {
     implementation("androidx.core:core-ktx:1.12.0")
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
-    implementation("com.google.android.material:material:1.9.0")
+    implementation("com.google.android.material:material:1.11.0")
     implementation("me.zhanghai.android.fastscroll:library:1.3.0")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")

app/src/main/AndroidManifest.xml

@@ -4,10 +4,12 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+    <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-feature android:name="android.hardware.camera" android:required="true"/>
     <application
         android:label="@string/app_name"
         android:icon="@mipmap/ic_launcher"
@@ -25,5 +27,14 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <provider
+        android:name="androidx.core.content.FileProvider"
+        android:authorities="${applicationId}.fileprovider"
+        android:exported="false"
+        android:grantUriPermissions="true">
+        <meta-data
+            android:name="android.support.FILE_PROVIDER_PATHS"
+            android:resource="@xml/file_paths" />
+    </provider>
     </application>
 </manifest>

app/src/main/kotlin/com/google/android/apps/bard/MainActivity.kt

@@ -13,17 +13,29 @@ import android.webkit.WebView
 import android.webkit.WebViewClient
 import android.window.OnBackInvokedDispatcher
 import android.content.SharedPreferences
+import android.net.Uri
+import android.os.Environment
+import android.provider.MediaStore
 import android.webkit.CookieManager
+import android.webkit.ValueCallback
+import android.webkit.WebChromeClient
 import android.webkit.WebSettings
+import androidx.core.content.FileProvider
 import com.google.android.apps.bard.databinding.ActivityMainBinding
 import com.google.android.material.snackbar.Snackbar
 import me.zhanghai.android.fastscroll.FastScrollerBuilder
+import java.io.File
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
 class MainActivity : Activity() {
-    private val userAgent = "Mozilla/5.0 (Linux; Android 13) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.5938.60 Mobile Safari/537.36"
+    private val userAgent = "Mozilla/5.0 (Linux; Android 14) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.6127.2 Mobile Safari/537.36"
     private val chatUrl = "https://bard.google.com/"
     private lateinit var binding: ActivityMainBinding
     private lateinit var sharedPreferences: SharedPreferences
     private lateinit var cookieManager: CookieManager
+    private var uploadMessage: ValueCallback<Array<Uri>>? = null
+    private val fileChooserResultCode = 1
     @SuppressLint("SetJavaScriptEnabled")
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
@@ -52,11 +64,41 @@ class MainActivity : Activity() {
         configureWebViewSettings()
         setupWebViewInterface()
         setupWebViewClient()
-        binding.swipeRefreshLayout.setOnRefreshListener {
-            binding.webView.reload()
-            binding.swipeRefreshLayout.isRefreshing = false
+        binding.webView.webChromeClient = object : WebChromeClient() {
+            override fun onShowFileChooser(webView: WebView, filePathCallback: ValueCallback<Array<Uri>>, fileChooserParams: FileChooserParams): Boolean {
+                uploadMessage = filePathCallback
+                val galleryIntent = Intent(Intent.ACTION_GET_CONTENT).apply {
+                    addCategory(Intent.CATEGORY_OPENABLE)
+                    type = "image/*"
+                }
+                val cameraIntent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
+                val photoFile = createImageFile()
+                val photoURI = FileProvider.getUriForFile(this@MainActivity, "com.example.fileprovider", photoFile)
+                cameraIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI)
+                val chooserIntent = Intent.createChooser(galleryIntent, "Image Chooser").apply {
+                    putExtra(Intent.EXTRA_INITIAL_INTENTS, arrayOf(cameraIntent))
+                }
+                startActivityForResult(chooserIntent, fileChooserResultCode)
+                return true
+            }
         }
     }
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == fileChooserResultCode) {
+            if (uploadMessage != null) {
+                val result = WebChromeClient.FileChooserParams.parseResult(resultCode, data)
+                uploadMessage?.onReceiveValue(result)
+                uploadMessage = null
+            }
+        }
+    }
+    private fun createImageFile(): File {
+        val timeStamp = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
+        val imageFileName = "JPEG_${timeStamp}_"
+        val storageDir = getExternalFilesDir(Environment.DIRECTORY_PICTURES)
+        return File.createTempFile(imageFileName, ".jpg", storageDir)
+    }
     private fun initializeFastScroller() {
         FastScrollerBuilder(binding.webView).useMd2Style().build()
     }
@@ -113,8 +155,6 @@ class MainActivity : Activity() {
                         saveUserAccount(userAccount)
                     }
                 }
-                binding.swipeRefreshLayout.isRefreshing = false
-                binding.swipeRefreshLayout.isEnabled = !(binding.webView.url?.contains(chatUrl) == true && !binding.webView.url.toString().contains("/auth"))
                 binding.webView.evaluateJavascript("""
                 (() => {
                   navigator.clipboard.writeText = (text) => {
@@ -126,6 +166,7 @@ class MainActivity : Activity() {
                 )
             }
         }
+
     }
     private fun extractUserAccountFromWebPage(): String {
         var userAccount = ""

app/src/main/res/layout/activity_main.xml

@@ -8,9 +8,5 @@
         android:layout_height="match_parent"
         android:focusable="true"
         android:focusableInTouchMode="true">
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-            android:id="@+id/swipe_refresh_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
     </me.zhanghai.android.fastscroll.FastScrollWebView>
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/xml/file_paths.xml

@@ -0,0 +1,3 @@
+<paths>
+    <external-path name="my_images" path="Android/data/${applicationId}/files/Pictures" />
+</paths>

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("com.android.application") version "8.1.2" apply false
-    id("com.android.library") version "8.1.2" apply false
+    id("com.android.application") version "8.1.4" apply false
+    id("com.android.library") version "8.1.4" apply false
     id("org.jetbrains.kotlin.android") version "1.9.0" apply false
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Oct 07 13:33:33 EEST 2023
+#Thu Dec 21 20:38:52 EET 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists