From 493ca9a85fd6a1e344f1b6234efd42bb7b5289bb Mon Sep 17 00:00:00 2001
From: Vishal Nehra <vishalmeham2@gmail.com>
Date: Fri, 12 May 2023 01:35:22 +0530
Subject: [PATCH] Update translations; add hidden analysis; bump version

---
 app/build.gradle                              |  6 +++---
 .../home_page/ui/files/FilesViewModel.kt      | 21 +++++++++++--------
 .../play/release-notes/en-US/production.txt   |  2 +-
 app/src/main/res/layout/fragment_analyse.xml  |  2 +-
 app/src/main/res/values/strings.xml           |  2 ++
 .../home_page/ui/options/Billing.kt           | 18 ++++++++--------
 6 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b97c06bc..5500b353 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -52,8 +52,8 @@ android {
         minSdk 21
         targetSdk 31
 
-        Integer sudoVersionCode = 23
-        String versionNameText = "1.83"
+        Integer sudoVersionCode = 25
+        String versionNameText = "1.85"
 
         String[] abiFilterList = property("abiFilters").toString().split(';')
         Integer minorVersion = 0
@@ -190,7 +190,7 @@ android {
             //    track.set("internal")
             track.set("production")
             userFraction.set(1.0d)
-            updatePriority.set(3)
+            updatePriority.set(4)
             releaseStatus.set(com.github.triplet.gradle.androidpublisher.ReleaseStatus.COMPLETED)
         }
     }
diff --git a/app/src/main/java/com/amaze/fileutilities/home_page/ui/files/FilesViewModel.kt b/app/src/main/java/com/amaze/fileutilities/home_page/ui/files/FilesViewModel.kt
index bdb55c2b..d081d2d7 100644
--- a/app/src/main/java/com/amaze/fileutilities/home_page/ui/files/FilesViewModel.kt
+++ b/app/src/main/java/com/amaze/fileutilities/home_page/ui/files/FilesViewModel.kt
@@ -1114,16 +1114,19 @@ class FilesViewModel(val applicationContext: Application) :
 
     fun checkInternetConnection(timeoutMs: Int): LiveData<Boolean> {
         return liveData(context = viewModelScope.coroutineContext + Dispatchers.Default) {
-            try {
-                val socket = Socket()
-                val socketAddress = InetSocketAddress("8.8.8.8", 53)
-
-                socket.connect(socketAddress, timeoutMs)
-                socket.close()
-                emit(true)
-            } catch (ex: IOException) {
-                log.info("failed to ping for connection", ex)
+            if (BuildConfig.IS_VERSION_FDROID) {
                 emit(applicationContext.isNetworkAvailable())
+            } else {
+                val socket = Socket()
+                try {
+                    val socketAddress = InetSocketAddress("208.67.222.222", 53)
+                    socket.connect(socketAddress, timeoutMs)
+                    socket.close()
+                    emit(true)
+                } catch (ex: IOException) {
+                    log.info("failed to ping for connection", ex)
+                    emit(applicationContext.isNetworkAvailable())
+                }
             }
         }
     }
diff --git a/app/src/main/play/release-notes/en-US/production.txt b/app/src/main/play/release-notes/en-US/production.txt
index 5b778713..0c6c49e7 100644
--- a/app/src/main/play/release-notes/en-US/production.txt
+++ b/app/src/main/play/release-notes/en-US/production.txt
@@ -1,5 +1,5 @@
 Changelog:
-- Add analysis for similar images
+- Add analysis for similar images and hidden files
 - Add support for .cbz , .fb2 and .mobi
 - Add support to search in pdf
 - Improve performance
diff --git a/app/src/main/res/layout/fragment_analyse.xml b/app/src/main/res/layout/fragment_analyse.xml
index ca08e64b..91825566 100644
--- a/app/src/main/res/layout/fragment_analyse.xml
+++ b/app/src/main/res/layout/fragment_analyse.xml
@@ -121,7 +121,7 @@
                 android:id="@+id/hidden_files_preview"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:analysisTitle="Hidden Files"
+                app:analysisTitle="@string/hidden_files"
                 app:showPreview="true"
                 android:layout_marginTop="@dimen/material_generic"
                 />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e657630d..771a589a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -946,4 +946,6 @@
     <string name="similar_images">Similar Images</string>
     <!-- similar images summary in analysis fragment -->
     <string name="similar_images_hint">Images that have similar colors</string>
+    <!-- hidden files in analysis fragment -->
+    <string name="hidden_files">Hidden Files</string>
 </resources>
diff --git a/app/src/play/java/com/amaze/fileutilities/home_page/ui/options/Billing.kt b/app/src/play/java/com/amaze/fileutilities/home_page/ui/options/Billing.kt
index 5abbbc00..f4c8b0a2 100644
--- a/app/src/play/java/com/amaze/fileutilities/home_page/ui/options/Billing.kt
+++ b/app/src/play/java/com/amaze/fileutilities/home_page/ui/options/Billing.kt
@@ -129,16 +129,16 @@ class Billing(val context: Context, private var uniqueId: String) :
                             )
                         }
                     }
-                } else {
-                    // greater than 1 for BillingClient.SkuType.INAPP items.
-                    log.info("consuming in app purchase")
-                    val consumeParams =
-                        ConsumeParams.newBuilder().setPurchaseToken(
-                            latestPurchase
-                                .purchaseToken
-                        ).build()
-                    billingClient!!.consumeAsync(consumeParams, purchaseConsumerListener)
                 }
+
+                // could be greater than 1 for BillingClient.SkuType.INAPP items.
+                log.info("consuming in app purchase")
+                val consumeParams =
+                    ConsumeParams.newBuilder().setPurchaseToken(
+                        latestPurchase
+                            .purchaseToken
+                    ).build()
+                billingClient!!.consumeAsync(consumeParams, purchaseConsumerListener)
             }
         } else {
             log.warn(