From 7a9cbd43e88533793f7763d9186f64549cbd4684 Mon Sep 17 00:00:00 2001
From: Abdul Mannan Saeed <111820160@umt.edu.pk>
Date: Wed, 1 Mar 2023 08:03:16 +0500
Subject: [PATCH] Bug Fixes

Bug Fixes
---
 app/src/main/AndroidManifest.xml                  |  2 +-
 .../homeController/homeController.java            | 10 +---------
 .../homeController/homeViewController.java        |  7 +------
 .../generalManager/settingGeneralController.java  |  2 +-
 .../main/res/layouts/home/layout/home_view.xml    | 15 ---------------
 app/variables.gradle                              |  4 ++--
 .../kotlin-compiler-7108739812455400130.salive    |  0
 .../torproject/android/service/OrbotService.java  |  2 +-
 8 files changed, 7 insertions(+), 35 deletions(-)
 delete mode 100644 build/kotlin/sessions/kotlin-compiler-7108739812455400130.salive

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8ec374d7..576abcb1 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="false">
+        android:usesCleartextTraffic="true">
 
         <activity
             android:launchMode="singleTask"
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 4faff618..96fdcba7 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
@@ -191,7 +191,6 @@ public class homeController extends AppCompatActivity implements ComponentCallba
     private ConstraintLayout mInfoPortrait;
     private ConstraintLayout mInfoLandscape;
     private com.google.android.material.appbar.AppBarLayout mAppBar;
-    private ProgressBar mProgressBarIndeterminate;
     private FragmentContainerView mTabFragment;
     private LinearLayout mTopBarContainer;
     private ImageView mTopBarHider;
@@ -277,12 +276,6 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         }
     }
 
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-    }
-
     public void initTor() {
 
         mHandler = new Handler();
@@ -593,7 +586,6 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         mFindBar = findViewById(R.id.pFindBar);
         mInfoPortrait = findViewById(R.id.pInfoPortrait);
         mInfoLandscape = findViewById(R.id.pInfoLandscape);
-        mProgressBarIndeterminate = findViewById(R.id.pProgressBarIndeterminate);
         mTabFragment = findViewById(R.id.mTabFragment);
         mTopBarHider = findViewById(R.id.pTopBarHider);
         mNewTabBlocker = findViewById(R.id.pNewTabBlocker);
@@ -612,7 +604,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         mGeckoView.setAutofillEnabled(true);
 
         mGeckoClient = new geckoClients();
-        mHomeViewController.initialization(new homeViewCallback(), this, mNewTab, mWebViewContainer, mLoadingText, mProgressBar, mSearchbar, mSplashScreen, mLoadingIcon, mBannerAds, mGatewaySplash, mTopBar, mGeckoView, mBackSplash, mConnectButton, mConnectNoTorButton, mFindBar, mFindText, mFindCount, mTopLayout, mVoiceInput, mMenu, mNestedScroll, mBlocker, mBlockerFullSceen, mSearchEngineBar, mCopyright, mHintListView, mAppBar, mOrbotLogManager, mInfoLandscape, mInfoPortrait, mProgressBarIndeterminate, mTabFragment, mTopBarContainer, mSearchLock, mTopBarHider, mNewTabBlocker, mCoordinatorLayout, mImageDivider, mPanicButton, mGenesisLogo, mPanicButtonLandscape, mTorDisabled, mSupportButton);
+        mHomeViewController.initialization(new homeViewCallback(), this, mNewTab, mWebViewContainer, mLoadingText, mProgressBar, mSearchbar, mSplashScreen, mLoadingIcon, mBannerAds, mGatewaySplash, mTopBar, mGeckoView, mBackSplash, mConnectButton, mConnectNoTorButton, mFindBar, mFindText, mFindCount, mTopLayout, mVoiceInput, mMenu, mNestedScroll, mBlocker, mBlockerFullSceen, mSearchEngineBar, mCopyright, mHintListView, mAppBar, mOrbotLogManager, mInfoLandscape, mInfoPortrait, mTabFragment, mTopBarContainer, mSearchLock, mTopBarHider, mNewTabBlocker, mCoordinatorLayout, mImageDivider, mPanicButton, mGenesisLogo, mPanicButtonLandscape, mTorDisabled, mSupportButton);
         mGeckoView.onSetHomeEvent(new nestedGeckoViewCallback());
     }
 
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeViewController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeViewController.java
index b451800c..c8ada0b3 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeViewController.java
+++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeViewController.java
@@ -112,7 +112,6 @@ public class homeViewController {
     private ConstraintLayout mInfoPortrait;
     private ConstraintLayout mInfoLandscape;
     private NestedScrollView mNestedScroll;
-    private ProgressBar mProgressBarIndeterminate;
     private FragmentContainerView mTabFragment;
     private LinearLayout mTopBarContainer;
     private ImageView mSearchLock;
@@ -133,7 +132,7 @@ public class homeViewController {
     private boolean mIsTopBarExpanded = true;
     private NestedScrollView.MarginLayoutParams mDefaultMargin = null;
 
-    public void initialization(eventObserver.eventListener event, AppCompatActivity context, Button mNewTab, ConstraintLayout webviewContainer, TextView loadingText, ProgressBar progressBar, editTextManager searchbar, ConstraintLayout splashScreen, ImageView loading, View banner_ads, ImageButton gateway_splash, LinearLayout top_bar, GeckoView gecko_view, ImageView backsplash, Button connect_button, Button connect_no_tor_button, View pFindBar, EditText pFindText, TextView pFindCount, androidx.constraintlayout.widget.ConstraintLayout pTopLayout, ImageButton pVoiceInput, ImageButton pMenu, androidx.core.widget.NestedScrollView pNestedScroll, ImageView pBlocker, ImageView pBlockerFullSceen, View mSearchEngineBar, TextView pCopyright, RecyclerView pHistListView, com.google.android.material.appbar.AppBarLayout pAppBar, ImageButton pOrbotLogManager, ConstraintLayout pInfoLandscape, ConstraintLayout pInfoPortrait, ProgressBar pProgressBarIndeterminate, FragmentContainerView pTabFragment, LinearLayout pTopBarContainer, ImageView pSearchLock, ImageView pTopBarHider, ImageView pNewTabBlocker, CoordinatorLayout mCoordinatorLayout, ImageView pImageDivider, ImageButton pPanicButton, ImageView pGenesisLogo, ImageButton pPanicButtonLandscape, ImageView pTorDisabled, ImageButton pSupportButton) {
+    public void initialization(eventObserver.eventListener event, AppCompatActivity context, Button mNewTab, ConstraintLayout webviewContainer, TextView loadingText, ProgressBar progressBar, editTextManager searchbar, ConstraintLayout splashScreen, ImageView loading, View banner_ads, ImageButton gateway_splash, LinearLayout top_bar, GeckoView gecko_view, ImageView backsplash, Button connect_button, Button connect_no_tor_button, View pFindBar, EditText pFindText, TextView pFindCount, androidx.constraintlayout.widget.ConstraintLayout pTopLayout, ImageButton pVoiceInput, ImageButton pMenu, androidx.core.widget.NestedScrollView pNestedScroll, ImageView pBlocker, ImageView pBlockerFullSceen, View mSearchEngineBar, TextView pCopyright, RecyclerView pHistListView, com.google.android.material.appbar.AppBarLayout pAppBar, ImageButton pOrbotLogManager, ConstraintLayout pInfoLandscape, ConstraintLayout pInfoPortrait, FragmentContainerView pTabFragment, LinearLayout pTopBarContainer, ImageView pSearchLock, ImageView pTopBarHider, ImageView pNewTabBlocker, CoordinatorLayout mCoordinatorLayout, ImageView pImageDivider, ImageButton pPanicButton, ImageView pGenesisLogo, ImageButton pPanicButtonLandscape, ImageView pTorDisabled, ImageButton pSupportButton) {
         this.mContext = context;
         this.mProgressBar = progressBar;
         this.mSearchbar = searchbar;
@@ -162,7 +161,6 @@ public class homeViewController {
         this.mInfoPortrait = pInfoPortrait;
         this.mInfoLandscape = pInfoLandscape;
         this.mNestedScroll = pNestedScroll;
-        this.mProgressBarIndeterminate = pProgressBarIndeterminate;
         this.mTabFragment = pTabFragment;
         this.mTopBarContainer = pTopBarContainer;
         this.mSearchLock = pSearchLock;
@@ -596,7 +594,6 @@ public class homeViewController {
     }
 
     public void onPostScreenDisable() {
-        mProgressBarIndeterminate.setVisibility(View.GONE);
         mSplashScreen.setClickable(false);
         mSplashScreen.setFocusable(false);
         mSearchbar.setEnabled(true);
@@ -621,8 +618,6 @@ public class homeViewController {
             mLoadingText.animate().setStartDelay(0).setDuration(250).alpha(1);
         }
 
-        mProgressBarIndeterminate.setVisibility(View.VISIBLE);
-        mProgressBarIndeterminate.animate().alpha(1);
         mConnectButton.setEnabled(false);
         mConnectNoTorButton.setEnabled(false);
         mSplashScreen.setEnabled(false);
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/generalManager/settingGeneralController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/generalManager/settingGeneralController.java
index fe6816f9..4a8f9fda 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/generalManager/settingGeneralController.java
+++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/generalManager/settingGeneralController.java
@@ -216,7 +216,7 @@ public class settingGeneralController extends AppCompatActivity {
     }
 
     public void onSelectTheme(View view) {
-        if(status.sLowMemory == enums.MemoryStatus.CRITICAL_MEMORY){
+        if(status.sLowMemory == enums.MemoryStatus.CRITICAL_MEMORY || status.sLowMemory == enums.MemoryStatus.LOW_MEMORY){
             pluginController.getInstance().onMessageManagerInvoke(Collections.singletonList(this), M_LOW_MEMORY);
             return;
         }
diff --git a/app/src/main/res/layouts/home/layout/home_view.xml b/app/src/main/res/layouts/home/layout/home_view.xml
index 3817f25b..1ddc30b8 100644
--- a/app/src/main/res/layouts/home/layout/home_view.xml
+++ b/app/src/main/res/layouts/home/layout/home_view.xml
@@ -746,21 +746,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 tools:ignore="RtlSymmetry" />
 
-            <ProgressBar
-                android:id="@+id/pProgressBarIndeterminate"
-                style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="match_parent"
-                android:layout_height="16dp"
-                android:alpha="0"
-                android:elevation="5dp"
-                android:indeterminate="true"
-                android:indeterminateTint="#99ffff"
-                android:translationY="6.5dp"
-                android:visibility="gone"
-                app:layout_constraintBottom_toTopOf="@+id/pCopyright"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
             <View
                 android:id="@+id/pDivider1"
                 android:layout_width="match_parent"
diff --git a/app/variables.gradle b/app/variables.gradle
index dd423236..f0e4e538 100755
--- a/app/variables.gradle
+++ b/app/variables.gradle
@@ -1,6 +1,6 @@
 /* Version */
-project.ext.vname = 'Build | Dark-Origin 1.1.0.2'
-project.ext.vcode = 530
+project.ext.vname = 'Build | Dark-Origin 1.1.0.3'
+project.ext.vcode = 535
 project.ext.buildType = 'release'
 project.ext.jvmTarget = "1.8"
 project.ext.applovin_key = "pCPe4EeU2ZQVwQPeHLgseRqHBX1V5pvo9Piuu4J809dRhadEgukXa1A8po_UeXu5hmPOTaP1v4QPaMKIEOhh50"
diff --git a/build/kotlin/sessions/kotlin-compiler-7108739812455400130.salive b/build/kotlin/sessions/kotlin-compiler-7108739812455400130.salive
deleted file mode 100644
index e69de29b..00000000
diff --git a/orbotmanager/src/main/java/org/torproject/android/service/OrbotService.java b/orbotmanager/src/main/java/org/torproject/android/service/OrbotService.java
index ef0245c2..66d8ab4e 100644
--- a/orbotmanager/src/main/java/org/torproject/android/service/OrbotService.java
+++ b/orbotmanager/src/main/java/org/torproject/android/service/OrbotService.java
@@ -1156,7 +1156,7 @@ public class OrbotService extends VpnService implements OrbotConstants {
                     }
                     orbotLocalConstants.mNetworkState = mConnectivity;
                     if(mConnectivity){
-                        showToolbarNotification(getString(R.string.newnym), NOTIFY_ID, R.mipmap.ic_stat_tor_logo);
+                        //showToolbarNotification(getString(R.string.newnym), NOTIFY_ID, R.mipmap.ic_stat_tor_logo);
                     }
                 }
             };