From 1c09e4229461eac5401501894dd636f1383a30e1 Mon Sep 17 00:00:00 2001
From: "com.d4rk.androidtutorials" <d4rk7355608@gmail.com>
Date: Sat, 7 Oct 2023 13:51:47 +0300
Subject: [PATCH] Update 1.0.1

---
 .idea/gradle.xml                              |  2 +-
 .idea/misc.xml                                |  2 +-
 CHANGELOG.md                                  |  7 +-
 app/build.gradle                              | 59 --------------
 app/build.gradle.kts                          | 61 +++++++++++++++
 app/src/main/AndroidManifest.xml              |  4 +
 .../google/android/apps/bard/MainActivity.kt  | 76 ++++++++++---------
 app/src/main/res/layout/activity_main.xml     | 22 +++---
 build.gradle                                  |  8 --
 build.gradle.kts                              |  5 ++
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 settings.gradle => settings.gradle.kts        |  6 +-
 12 files changed, 133 insertions(+), 123 deletions(-)
 delete mode 100644 app/build.gradle
 create mode 100644 app/build.gradle.kts
 delete mode 100644 build.gradle
 create mode 100644 build.gradle.kts
 rename settings.gradle => settings.gradle.kts (75%)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a0de2a1..ae388c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 773fe0f..8978d23 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a75aed..fb9fe6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,2 +1,7 @@
-# Version 1.0_r1:
+# Version 1.0.1:
+- **Patch**: Fixed the error message that appeared when users had cookies issues.
+- **Minor**: Migrated the build.gradle file to Kotlin DSL (build.gradle.kts).
+- **Minor**: Updated dependencies to the latest versions.
+
+# Version 1.0.0:
 - Initial stable version.
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index 60ad437..0000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,59 +0,0 @@
-plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
-}
-android {
-    compileSdk 33
-    namespace 'com.google.android.apps.bard'
-    defaultConfig {
-        applicationId 'com.google.android.apps.bard'
-        minSdk 27
-        targetSdk 33
-        versionCode 1
-        versionName '1.0_r1'
-        archivesBaseName = "${applicationId}-v${versionName}"
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-    }
-    buildTypes {
-        release {
-            multiDexEnabled true
-            minifyEnabled true
-            shrinkResources true
-            debuggable false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-        debug {
-            multiDexEnabled true
-            minifyEnabled true
-            shrinkResources true
-            debuggable true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = '17'
-    }
-    buildFeatures {
-        viewBinding = true
-    }
-    bundle {
-        storeArchive {
-            enable = true
-        }
-    }
-}
-dependencies {
-    implementation 'com.google.android.material:material:1.9.0'
-    implementation 'androidx.core:core-ktx:1.10.1'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    implementation 'me.zhanghai.android.fastscroll:library:1.2.0'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-}
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 0000000..03c4481
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,61 @@
+import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+}
+android {
+    compileSdk = 34
+    namespace = "com.google.android.apps.bard"
+    defaultConfig {
+        applicationId = "com.google.android.apps.bard"
+        minSdk = 26
+        targetSdk = 34
+        versionCode = 2
+        versionName = "1.0.1"
+        archivesName = "${applicationId}-v${versionName}"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            multiDexEnabled = true
+            isMinifyEnabled = true
+            isShrinkResources = true
+            isDebuggable = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+        debug {
+            multiDexEnabled = true
+            isMinifyEnabled = true
+            isShrinkResources = true
+            isDebuggable = true
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+    buildFeatures {
+        viewBinding = true
+        buildConfig = true
+    }
+    bundle {
+        storeArchive {
+            enable = true
+        }
+    }
+}
+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("me.zhanghai.android.fastscroll:library:1.3.0")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5508405..99282da 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,10 @@
     <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.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" />
     <application
         android:label="@string/app_name"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/kotlin/com/google/android/apps/bard/MainActivity.kt b/app/src/main/kotlin/com/google/android/apps/bard/MainActivity.kt
index c51b542..aa9e857 100644
--- a/app/src/main/kotlin/com/google/android/apps/bard/MainActivity.kt
+++ b/app/src/main/kotlin/com/google/android/apps/bard/MainActivity.kt
@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
+import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.webkit.JavascriptInterface
@@ -15,12 +16,14 @@ import android.content.SharedPreferences
 import android.webkit.CookieManager
 import android.webkit.WebSettings
 import com.google.android.apps.bard.databinding.ActivityMainBinding
+import com.google.android.material.snackbar.Snackbar
 import me.zhanghai.android.fastscroll.FastScrollerBuilder
 class MainActivity : Activity() {
-    private val userAgent = "Mozilla/5.0 (Linux; Android 10) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.5615.135 Mobile Safari/537.36"
+    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 chatUrl = "https://bard.google.com/"
     private lateinit var binding: ActivityMainBinding
     private lateinit var sharedPreferences: SharedPreferences
+    private lateinit var cookieManager: CookieManager
     @SuppressLint("SetJavaScriptEnabled")
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
@@ -32,6 +35,9 @@ class MainActivity : Activity() {
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
         sharedPreferences = getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
+        cookieManager = CookieManager.getInstance()
+        cookieManager.setAcceptCookie(true)
+        cookieManager.setAcceptThirdPartyCookies(binding.webView, true)
         initializeFastScroller()
         registerBackButtonCallback()
         val userAccount = getUserAccount()
@@ -48,17 +54,15 @@ class MainActivity : Activity() {
         setupWebViewClient()
         binding.swipeRefreshLayout.setOnRefreshListener {
             binding.webView.reload()
+            binding.swipeRefreshLayout.isRefreshing = false
         }
-        binding.webView.loadUrl(chatUrl)
     }
     private fun initializeFastScroller() {
         FastScrollerBuilder(binding.webView).useMd2Style().build()
     }
     private fun registerBackButtonCallback() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            onBackInvokedDispatcher.registerOnBackInvokedCallback(
-                OnBackInvokedDispatcher.PRIORITY_DEFAULT
-            ) {
+            onBackInvokedDispatcher.registerOnBackInvokedCallback(OnBackInvokedDispatcher.PRIORITY_DEFAULT) {
                 if (binding.webView.canGoBack()) {
                     binding.webView.goBack()
                 } else {
@@ -69,9 +73,6 @@ class MainActivity : Activity() {
     }
     @SuppressLint("SetJavaScriptEnabled")
     private fun configureWebViewSettings() {
-        val cookieManager = CookieManager.getInstance()
-        cookieManager.setAcceptCookie(true)
-        cookieManager.setAcceptThirdPartyCookies(binding.webView, true)
         binding.webView.settings.apply {
             cacheMode = WebSettings.LOAD_DEFAULT
             userAgentString = userAgent
@@ -84,49 +85,51 @@ class MainActivity : Activity() {
     }
     private fun setupWebViewClient() {
         binding.webView.webViewClient = object : WebViewClient() {
-            override fun shouldOverrideUrlLoading(
-                view: WebView?,
-                request: WebResourceRequest?
-            ): Boolean {
-                val url = request?.url ?: return false
-                if (url.toString().contains(chatUrl)) {
+            override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
+                val urlString = request?.url?.toString() ?: return false
+                if (urlString == "alert://alert") {
+                    Snackbar.make(binding.root, "alert", Snackbar.LENGTH_LONG).show()
+                } else if (urlString == "choose://image") {
+                    val intent = Intent(Intent.ACTION_GET_CONTENT)
+                    intent.addCategory(Intent.CATEGORY_OPENABLE)
+                    intent.type = "image/*"
+                    startActivityForResult(intent, 1)
+                    return true
+                }
+                if (urlString.contains(chatUrl)) {
                     return false
                 }
-                if (binding.webView.url.toString().contains(chatUrl) && !binding.webView.url.toString().contains("/auth")) {
-                    view?.loadUrl(url.toString())
+                if (binding.webView.url?.contains(chatUrl) == true && !binding.webView.url.toString().contains("/auth")) {
+                    view?.loadUrl(urlString)
                     return true
                 }
                 return false
             }
             override fun onPageFinished(view: WebView?, url: String?) {
                 super.onPageFinished(view, url)
-                if (binding.webView.url.toString().contains(chatUrl) && !binding.webView.url.toString().contains("/auth")) {
+                if (binding.webView.url?.contains(chatUrl) == true && !binding.webView.url.toString().contains("/auth")) {
                     val userAccount = extractUserAccountFromWebPage()
                     if (userAccount.isNotEmpty()) {
                         saveUserAccount(userAccount)
                     }
                 }
-                binding.swipeRefreshLayout.isRefreshing =
-                    false
-                binding.swipeRefreshLayout.isEnabled =
-                    !(binding.webView.url.toString().contains(chatUrl) && !binding.webView.url.toString().contains("/auth"))
-                binding.webView.evaluateJavascript(
-                    """
-                    (() => {
-                      navigator.clipboard.writeText = (text) => {
-                            Android.copyToClipboard(text);
-                            return Promise.resolve();
-                        }
-                    })();
-                    """.trimIndent(), null
+                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) => {
+                        Android.copyToClipboard(text);
+                        return Promise.resolve();
+                    }
+                })();
+                """.trimIndent(), null
                 )
             }
         }
     }
     private fun extractUserAccountFromWebPage(): String {
         var userAccount = ""
-        binding.webView.evaluateJavascript(
-            """
+        binding.webView.evaluateJavascript("""
         (function() {
             // Replace this code with the appropriate JavaScript code to extract the account information
             // Example: If the account is stored in a DOM element with id "account", you can use the following code:
@@ -136,8 +139,7 @@ class MainActivity : Activity() {
             }
             return '';
         })();
-        """
-        ) { result ->
+        """) { result ->
             userAccount = result?.trim('"') ?: ""
         }
         return userAccount
@@ -147,7 +149,6 @@ class MainActivity : Activity() {
     }
     override fun onPause() {
         super.onPause()
-        val cookieManager = CookieManager.getInstance()
         val cookies = cookieManager.getCookie(chatUrl)
         sharedPreferences.edit().putString("cookies", cookies).apply()
     }
@@ -155,7 +156,8 @@ class MainActivity : Activity() {
         super.onResume()
         val cookies = sharedPreferences.getString("cookies", "")
         if (!cookies.isNullOrEmpty()) {
-            val cookieManager = CookieManager.getInstance()
+            cookieManager.removeAllCookies(null)
+            cookieManager.flush()
             val cookieArray = cookies.split(";")
             for (cookie in cookieArray) {
                 cookieManager.setCookie(chatUrl, cookie)
@@ -182,4 +184,4 @@ class MainActivity : Activity() {
     private fun getUserAccount(): String {
         return sharedPreferences.getString("userAccount", "") ?: ""
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 816bb77..c4d77c0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,18 +1,16 @@
 <androidx.constraintlayout.widget.ConstraintLayout
     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=".MainActivity">
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/swipeRefreshLayout"
+    android:layout_height="match_parent">
+    <me.zhanghai.android.fastscroll.FastScrollWebView
+        android:id="@+id/web_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <me.zhanghai.android.fastscroll.FastScrollWebView
-            android:id="@+id/web_view"
+        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"
-            android:focusable="true"
-            android:focusableInTouchMode="true"/>
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+            android:layout_height="match_parent"/>
+    </me.zhanghai.android.fastscroll.FastScrollWebView>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 817ac16..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,8 +0,0 @@
-plugins {
-    id 'com.android.application' version '8.0.2' apply false
-    id 'com.android.library' version '8.0.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
-}
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..d22519c
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+    id("com.android.application") version "8.1.2" apply false
+    id("com.android.library") version "8.1.2" apply false
+    id("org.jetbrains.kotlin.android") version "1.9.0" apply false
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b6eacb6..f22f26c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jul 16 12:27:34 EEST 2023
+#Sat Oct 07 13:33:33 EEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle.kts
similarity index 75%
rename from settings.gradle
rename to settings.gradle.kts
index a02d6c3..7f1b815 100644
--- a/settings.gradle
+++ b/settings.gradle.kts
@@ -1,16 +1,18 @@
 pluginManagement {
     repositories {
+        gradlePluginPortal()
         google()
+        maven(url = "https://jitpack.io")
         mavenCentral()
-        gradlePluginPortal()
     }
 }
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
         google()
+        maven(url = "https://jitpack.io")
         mavenCentral()
     }
 }
 rootProject.name = "Bard"
-include ':app'
+include(":app")
\ No newline at end of file