From 013669005dcdf31b2e21130635d461373945ee52 Mon Sep 17 00:00:00 2001
From: Abdul Mannan Saeed <111820160@umt.edu.pk>
Date: Tue, 28 Feb 2023 01:09:10 +0500
Subject: [PATCH] Bug Fixes

Bug Fixes
---
 .idea/compiler.xml                            |  2 +-
 .safedk/app_sdks.lst                          |  1 +
 .safedk/hashes.safedk                         |  4 ++--
 .safedk/plugin.properties                     |  2 +-
 app/src/main/AndroidManifest.xml              |  2 +-
 .../delegateModel/historyDelegate.java        | 10 +++++----
 .../geckoManager/geckoClients.java            | 21 ++++++++++++-------
 .../helperClasses/permissionHandler.java      |  4 +---
 .../homeController/homeController.java        | 10 +++++----
 app/variables.gradle                          |  4 ++--
 10 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 3e3a51b0..7d7ec2ea 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="19" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.safedk/app_sdks.lst b/.safedk/app_sdks.lst
index 027b0c70..4190b730 100644
--- a/.safedk/app_sdks.lst
+++ b/.safedk/app_sdks.lst
@@ -2,6 +2,7 @@
 fd38d80abf402c0cce74ac84b578f259
 290c7ef397aa241b98bf9cf07be6584f
 4df96d3bc9afd17b812e65e6c6add1ef
+974322f19d813702ea048d95288d2b8c
 29015bbfcc182d80e7f75bd2c38e4521
 59cd112b25ecb5af4f5290bb180cd582
 ff22dbf67af979b8b3169a242d10f166
diff --git a/.safedk/hashes.safedk b/.safedk/hashes.safedk
index 6fa40787..05e6568a 100644
--- a/.safedk/hashes.safedk
+++ b/.safedk/hashes.safedk
@@ -1,3 +1,3 @@
-#Mon Feb 27 01:42:36 PKT 2023
+#Mon Feb 27 20:15:13 PKT 2023
 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000=
-json=-302677807
+json=1273416261
diff --git a/.safedk/plugin.properties b/.safedk/plugin.properties
index 4a8b03a9..d31b7c3f 100644
--- a/.safedk/plugin.properties
+++ b/.safedk/plugin.properties
@@ -1,5 +1,5 @@
 #
-#Mon Feb 27 01:42:36 PKT 2023
+#Mon Feb 27 20:15:13 PKT 2023
 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000=
 sdk_analysis_plugin_version=4.9.0
 set_multidex=true
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 576abcb1..8ec374d7 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,7 +26,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:usesCleartextTraffic="true">
+        android:usesCleartextTraffic="false">
 
         <activity
             android:launchMode="singleTask"
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/delegateModel/historyDelegate.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/delegateModel/historyDelegate.java
index 84055b7a..4ee46365 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/delegateModel/historyDelegate.java
+++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/delegateModel/historyDelegate.java
@@ -57,10 +57,12 @@ public class historyDelegate implements GeckoSession.HistoryDelegate {
             if(mCurrentIndex != var2.getCurrentIndex() && mHistoryChanged){
                 mEvent.invokeObserver(Arrays.asList(mGeckoDataModel.mCurrentURL, mGeckoDataModel.mSessionID, mHistory.get(mHistory.getCurrentIndex()).getTitle(), mGeckoDataModel.mCurrentURL_ID, mGeckoDataModel.mTheme, mGeckoSession), homeEnums.eGeckoCallback.ON_UPDATE_SEARCH_BAR);
             }
-            Object mID = mEvent.invokeObserver(Arrays.asList(mGeckoDataModel.mCurrentURL, mGeckoDataModel.mSessionID, mHistory.get(mHistory.getCurrentIndex()).getTitle(), -1, mGeckoDataModel.mTheme, mGeckoSession, false), homeEnums.eGeckoCallback.ON_UPDATE_HISTORY);
-            if (mID != null) {
-                mGeckoDataModel.mCurrentURL_ID = (int) mID;
-            }
+            try {
+                Object mID = mEvent.invokeObserver(Arrays.asList(mGeckoDataModel.mCurrentURL, mGeckoDataModel.mSessionID, mHistory.get(mHistory.getCurrentIndex()).getTitle(), -1, mGeckoDataModel.mTheme, mGeckoSession, false), homeEnums.eGeckoCallback.ON_UPDATE_HISTORY);
+                if (mID != null) {
+                    mGeckoDataModel.mCurrentURL_ID = (int) mID;
+                }
+            }catch (Exception ex){}
         }
         mCurrentIndex = var2.getCurrentIndex();
     }
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/geckoClients.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/geckoClients.java
index 4f8a7e11..d8a54976 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/geckoClients.java
+++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/geckoClients.java
@@ -95,14 +95,17 @@ public class geckoClients {
         }
     }
 
-    public void onSaveCurrentTab(boolean isHardCopy) {
+    public void onSaveCurrentTab(boolean isHardCopy, AppCompatActivity pContext) {
         int mStatus = (Integer) dataController.getInstance().invokeTab(dataEnums.eTabCommands.M_ADD_TAB, Arrays.asList(mSession, isHardCopy));
         if (mStatus == enums.AddTabCallback.TAB_FULL) {
-            pluginController.getInstance().onMessageManagerInvoke(Collections.singletonList(this), M_MAX_TAB_REACHED);
+            pluginController.getInstance().onMessageManagerInvoke(Collections.singletonList(pContext), M_MAX_TAB_REACHED);
         }
     }
 
     public void initRestore(geckoView mNestedGeckoView, AppCompatActivity pcontext) {
+        if(mSession==null){
+            return;
+        }
         boolean mState = mSession.onRestoreState();
         if (!mState) {
             mSession.stop();
@@ -302,11 +305,15 @@ public class geckoClients {
     }
 
     public String getTheme() {
-        if (mSessionID.equals(strings.GENERIC_EMPTY_STR)) {
-            return null;
-        } else if (mSession != null && mSession.getTheme() != null) {
-            return mSession.getTheme();
-        } else {
+        try {
+            if (mSessionID.equals(strings.GENERIC_EMPTY_STR)) {
+                return null;
+            } else if (mSession != null && mSession.getTheme() != null) {
+                return mSession.getTheme();
+            } else {
+                return null;
+            }
+        }catch (Exception ex){
             return null;
         }
     }
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/helperClasses/permissionHandler.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/helperClasses/permissionHandler.java
index a6723f38..1ff3b226 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/helperClasses/permissionHandler.java
+++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/helperClasses/permissionHandler.java
@@ -87,9 +87,7 @@ public class permissionHandler {
              public void onPermissionsChecked(MultiplePermissionsReport multiplePermissionsReport) {
                 try {
                     pMethodParam.call();
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
+                } catch (Exception e) {}
              }
 
              @Override
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeController.java
index a1e6d7dc..4faff618 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeController.java
+++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeController.java
@@ -666,7 +666,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
 
     public void initializeGeckoView(boolean isForced, boolean pDatabaseSavable) {
         mGeckoClient.initializeSession(mGeckoView, new geckoViewCallback(), this);
-        mGeckoClient.onSaveCurrentTab(pDatabaseSavable);
+        mGeckoClient.onSaveCurrentTab(pDatabaseSavable, this);
         initTabCountForced();
     }
 
@@ -1107,7 +1107,9 @@ public class homeController extends AppCompatActivity implements ComponentCallba
                 if(mSearchbar!=null){
                     mSearchbar.clearFocus();
                     mHomeViewController.onClearSelections(true);
-                    mHomeViewController.onUpdateSearchBar(mGeckoClient.getSession().getCurrentURL(), false, false, true);
+                    if(mGeckoClient!=null && mGeckoClient.getSession()!=null && mGeckoClient.getSession().getCurrentURL()!=null){
+                        mHomeViewController.onUpdateSearchBar(mGeckoClient.getSession().getCurrentURL(), false, false, true);
+                    }
                 }
                 break;
 
@@ -1612,7 +1614,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         mHomeViewController.onProgressBarUpdate(5, true, isStaticURL());
         dataController.getInstance().invokeTab(dataEnums.eTabCommands.M_UPDATE_PIXEL, Arrays.asList(mGeckoClient.getSession().getSessionID(), mRenderedBitmap, null, mGeckoView, false));
         mGeckoClient.initializeSession(mGeckoView, new geckoViewCallback(), this);
-        mGeckoClient.onSaveCurrentTab(true);
+        mGeckoClient.onSaveCurrentTab(true, this);
         dataController.getInstance().invokeTab(dataEnums.eTabCommands.MOVE_TAB_TO_TOP, Collections.singletonList(mGeckoClient.getSession()));
         initTabCountForced();
         mHomeViewController.progressBarReset();
@@ -1748,7 +1750,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             mGeckoClient.initializeSession(mGeckoView, new geckoViewCallback(), this);
             mHomeViewController.progressBarReset();
             mHomeViewController.onUpdateSearchBar(url, false, true, false);
-            mGeckoClient.onSaveCurrentTab(true);
+            mGeckoClient.onSaveCurrentTab(true, this);
             dataController.getInstance().invokeTab(dataEnums.eTabCommands.MOVE_TAB_TO_TOP, Collections.singletonList(mGeckoClient.getSession()));
             mGeckoClient.loadURL(url, mGeckoView, homeController.this);
             initTabCountForced();
diff --git a/app/variables.gradle b/app/variables.gradle
index 72693c13..fb4724bc 100755
--- a/app/variables.gradle
+++ b/app/variables.gradle
@@ -1,6 +1,6 @@
 /* Version */
-project.ext.vname = 'Build | Dark-Origin 1.1.0.0'
-project.ext.vcode = 520
+project.ext.vname = 'Build | Dark-Origin 1.1.0.1'
+project.ext.vcode = 525
 project.ext.buildType = 'release'
 project.ext.jvmTarget = "1.8"
 project.ext.applovin_key = "pCPe4EeU2ZQVwQPeHLgseRqHBX1V5pvo9Piuu4J809dRhadEgukXa1A8po_UeXu5hmPOTaP1v4QPaMKIEOhh50"