Bug Fixes

Bug Fixes

.idea/deploymentTargetDropDown.xml

@@ -12,6 +12,6 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-05-13T22:51:24.221202700Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-05-16T23:12:10.693316300Z" />
   </component>
 </project>

.idea/misc.xml

@@ -97,7 +97,10 @@
         <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/secure_connection_popup.xml" value="0.157421875" />
         <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/bookmark/layout/bookmark_row_view.xml" value="0.18541666666666667" />
         <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml" value="0.18541666666666667" />
-        <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/help/layout/help_view.xml" value="0.358695652173913" />
+        <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/help/layout-land/help_row_view.xml" value="0.14" />
+        <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/help/layout-land/help_view.xml" value="0.2" />
+        <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/help/layout/help_row_view.xml" value="0.5" />
+        <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/help/layout/help_view.xml" value="0.25" />
         <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/history/layout/activity_adview_controller.xml" value="0.33" />
         <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/history/layout/activity_orion_adview_controller.xml" value="0.25" />
         <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/history/layout/history_view.xml" value="0.20989583333333334" />
@@ -109,9 +112,10 @@
         <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/orbot/layout/orbot_settings_view.xml" value="0.18541666666666667" />
         <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/proxyStatus/layout/proxy_status_view.xml" value="0.18541666666666667" />
         <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/searchWidget/layout/widget_search_controller.xml" value="0.20989583333333334" />
-        <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/setting/layout/setting.xml" value="0.5" />
+        <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/setting/layout/setting.xml" value="0.21880762138905963" />
         <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/setting/layout/setting_advance_view.xml" value="0.37083333333333335" />
         <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/setting/layout/setting_advert_view.xml" value="0.33" />
+        <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/setting/layout/setting_general_view.xml" value="0.16036036036036036" />
         <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/setting/layout/setting_privacy_view.xml" value="0.67" />
         <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/setting/layout/setting_search_view.xml" value="0.358695652173913" />
         <entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/shared/listviews/layout/history_bookmark__row_menu.xml" value="0.18541666666666667" />

app/src/main/AndroidManifest.xml

@@ -77,7 +77,7 @@
 
         <activity
             android:name="com.hiddenservices.onionservices.appManager.helpManager.helpController"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|screenSize|uiMode"
             android:label="@string/SETTING_HEADER"
             android:windowSoftInputMode="adjustPan" />
 

app/src/main/assets/help/style/cs-help-dark.css

@@ -2,6 +2,9 @@
 body{
     background-color : #1c1b21 !important;
 }
+hr{
+  background: #333333;
+}
 
 .hi_logo_text{
   max-width: 450px;
@@ -14,14 +17,13 @@ body{
 }
 
 .hi_info{
-  margin-top: 30px;
+  margin-top: 10px;
-  padding-left:15px;
+  padding-left:5px;
   padding-bottom: 12px;
   padding-top: 10px;
   margin-bottom: 30px;
   height: auto;
   color:#d9d9d9;
-  border-left: 5px solid #ff9933;
 }
 
 .hi_bullets{

app/src/main/assets/help/style/cs-help.css

@@ -10,13 +10,12 @@
 }
 
 .hi_info{
-  margin-top: 30px;
+  margin-top: 10px;
-  padding-left:15px;
+  padding-left:5px;
   padding-bottom: 12px;
   padding-top: 10px;
   margin-bottom: 30px;
   height: auto;
-  border-left: 5px solid #ff9933;
 }
 
 .hi_bullets{

app/src/main/java/com/hiddenservices/onionservices/appManager/activityContextManager.java

@@ -1,9 +1,10 @@
 package com.hiddenservices.onionservices.appManager;
 
+import static com.hiddenservices.onionservices.constants.constants.CONST_PACKAGE_NAME;
 import android.content.Context;
-
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.example.myapplication.R;
 import com.hiddenservices.onionservices.appManager.bookmarkManager.bookmarkHome.bookmarkController;
 import com.hiddenservices.onionservices.appManager.bridgeManager.bridgeController;
 import com.hiddenservices.onionservices.appManager.historyManager.historyController;
@@ -12,7 +13,7 @@ import com.hiddenservices.onionservices.appManager.orbotLogManager.orbotLogContr
 import com.hiddenservices.onionservices.appManager.settingManager.generalManager.settingGeneralController;
 import com.hiddenservices.onionservices.appManager.settingManager.settingHomeManager.settingHomeController;
 import com.hiddenservices.onionservices.appManager.tabManager.tabController;
-
+import com.widget.onionservices.helperMethod.helperMethod;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 
@@ -80,7 +81,7 @@ public class activityContextManager {
 
     public homeController getHomeController() {
         if (pHomeController == null) {
-            return null;
+            helperMethod.onStartApplication(pApplicationContext.get(), CONST_PACKAGE_NAME);
         }
         return pHomeController.get();
     }
@@ -212,4 +213,20 @@ public class activityContextManager {
             }
         }
     }
+    public void onCheckPurgeStack() {
+        if(pHomeController==null || pHomeController.get() == null){
+            for (int mCounter = 0; mCounter < mStackList.size(); mCounter++) {
+                try {
+                    if (!mStackList.get(mCounter).get().isFinishing()) {
+                        mStackList.get(mCounter).get().finish();
+                        mStackList.get(mCounter).get().overridePendingTransition(R.anim.translate_fade_left_crash, R.anim.translate_fade_right_crash);
+                    }
+                    mStackList.remove(mCounter);
+                    mCounter -= 1;
+
+                } catch (Exception ignored) {
+                }
+            }
+        }
+    }
 }

app/src/main/java/com/hiddenservices/onionservices/appManager/bookmarkManager/bookmarkHome/bookmarkController.java

@@ -256,6 +256,7 @@ public class bookmarkController extends AppCompatActivity {
 
     @Override
     public void onResume() {
+        activityContextManager.getInstance().onCheckPurgeStack();
         pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_RESUME);
         activityContextManager.getInstance().setCurrentActivity(this);
         status.sSettingIsAppPaused = false;

app/src/main/java/com/hiddenservices/onionservices/appManager/bookmarkManager/bookmarkSettings/bookmarkSettingController.java

@@ -131,6 +131,7 @@ public class bookmarkSettingController extends AppCompatActivity {
 
     @Override
     public void onResume() {
+        activityContextManager.getInstance().onCheckPurgeStack();
         pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_RESUME);
         activityContextManager.getInstance().setCurrentActivity(this);
         super.onResume();

app/src/main/java/com/hiddenservices/onionservices/appManager/bridgeManager/bridgeController.java

@@ -195,6 +195,7 @@ public class bridgeController extends AppCompatActivity implements View.OnFocusC
 
     @Override
     public void onResume() {
+        activityContextManager.getInstance().onCheckPurgeStack();
         pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_RESUME);
         activityContextManager.getInstance().setCurrentActivity(this);
 

app/src/main/java/com/hiddenservices/onionservices/appManager/helpManager/helpAdapter.java

@@ -39,15 +39,20 @@ public class helpAdapter extends RecyclerView.Adapter<helpAdapter.helpViewHolder
     }
 
     private void onSearchFilterInvoked(String pQuery) {
+        int mCount = 0;
+        int mModelListSize = mModelList.size();
+
         pQuery = pQuery.toLowerCase();
         this.mModelList.clear();
         mCurrentPosition = -1;
         for (int mCounter = 0; mCounter < mCompleteModelList.size(); mCounter++) {
             if (mCompleteModelList.get(mCounter).getHeader().toLowerCase().contains(pQuery) || mCompleteModelList.get(mCounter).getDescription().toLowerCase().contains(pQuery)) {
                 mModelList.add(mCompleteModelList.get(mCounter));
+                mCount+=1;
             }
         }
-        notifyDataSetChanged();
+        notifyItemRangeRemoved(mCount,mModelListSize);
+        notifyItemRangeChanged(0,mModelList.size());
     }
 
     @NonNull

app/src/main/java/com/hiddenservices/onionservices/appManager/helpManager/helpController.java

@@ -2,7 +2,6 @@ package com.hiddenservices.onionservices.appManager.helpManager;
 
 import android.content.res.Configuration;
 import android.os.Bundle;
-import android.os.Handler;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.MotionEvent;
@@ -47,10 +46,6 @@ public class helpController extends AppCompatActivity {
     private Button mReloadButton;
     private editViewController mSearchInput;
 
-    /*Private Variables*/
-    private Handler mSearchInvokedHandler = new Handler();
-    private Runnable postToServerRunnable;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_ACTIVITY_CREATED);
@@ -126,16 +121,11 @@ public class helpController extends AppCompatActivity {
 
         mSearchInput.setEventHandler(new edittextManagerCallback());
 
-        if (mHelpAdapter != null) {
-            postToServerRunnable = () -> mHelpAdapter.onTrigger(helpEnums.eHelpAdapter.M_INIT_FILTER, Collections.singletonList(mSearchInput.getText().toString()));
-        }
-
         mSearchInput.addTextChangedListener(new TextWatcher() {
 
             @Override
             public void afterTextChanged(Editable s) {
-                mSearchInvokedHandler.removeCallbacks(postToServerRunnable);
+                mHelpAdapter.onTrigger(helpEnums.eHelpAdapter.M_INIT_FILTER, Collections.singletonList(mSearchInput.getText().toString()));
-                mSearchInvokedHandler.postDelayed(postToServerRunnable, 50);
             }
 
             @Override
@@ -239,6 +229,7 @@ public class helpController extends AppCompatActivity {
 
     @Override
     protected void onResume() {
+        activityContextManager.getInstance().onCheckPurgeStack();
         pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_RESUME);
         super.onResume();
     }

app/src/main/java/com/hiddenservices/onionservices/appManager/historyManager/historyController.java

@@ -275,6 +275,7 @@ public class historyController extends AppCompatActivity {
 
     @Override
     public void onResume() {
+        activityContextManager.getInstance().onCheckPurgeStack();
         pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_RESUME);
         activityContextManager.getInstance().setCurrentActivity(this);
         status.sSettingIsAppPaused = false;

app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/geckoClients.java

@@ -340,6 +340,7 @@ public class geckoClients {
 
 
     public void onGetFavIcon(ImageView pImageView, String pURL, AppCompatActivity pcontext) {
+        initBrowserManager(pcontext);
         pURL = helperMethod.completeURL(helperMethod.getDomainName(pURL));
         mIconManager.onLoadIconIntoView(pImageView, pURL);
     }

app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/geckoSession.java

@@ -1269,7 +1269,7 @@ geckoSession extends GeckoSession implements MediaSession.Delegate, GeckoSession
     private void checkApplicationRate() {
         if (status.sSettingIsAppStarted) {
             if (status.sGlobalURLCount == 10) {
-                event.invokeObserver(Arrays.asList(mCurrentURL, mSessionID, mCurrentTitle, mTheme), M_RATE_APPLICATION);
+                // event.invokeObserver(Arrays.asList(mCurrentURL, mSessionID, mCurrentTitle, mTheme), M_RATE_APPLICATION);
             } else if (status.sGlobalURLCount == 20 || status.sGlobalURLCount == 80) {
                 event.invokeObserver(Arrays.asList(mCurrentURL, mSessionID, mCurrentTitle, mTheme), M_DEFAULT_BROWSER);
             }

app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeController.java

@@ -95,8 +95,11 @@ import org.torproject.android.service.util.Prefs;
 import org.torproject.android.service.wrapper.LocaleHelper;
 import org.torproject.android.service.wrapper.orbotLocalConstants;
 
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -2534,8 +2537,10 @@ public class homeController extends AppCompatActivity implements ComponentCallba
                 pluginController.getInstance().onMessageManagerInvoke(mData, M_DOWNLOAD_SINGLE);
             } else if (e_type.equals(enums.etype.on_full_screen)) {
                 boolean status = (Boolean) data.get(0);
+                if(!status){
+                    mGeckoClient.onStopMedia();
+                }
                 mHomeViewController.onFullScreenUpdate(status);
-
                 mHomeViewController.onUpdateSearchEngineBar(false, 0);
             } else if (e_type.equals(enums.etype.on_update_favicon)) {
                 dataController.getInstance().invokeImage(dataEnums.eImageCommands.M_REQUEST_IMAGE_URL, Collections.singletonList(data.get(0)));

app/src/main/java/com/hiddenservices/onionservices/appManager/languageManager/languageController.java

@@ -222,6 +222,7 @@ public class languageController extends AppCompatActivity {
 
     @Override
     protected void onResume() {
+        activityContextManager.getInstance().onCheckPurgeStack();
         if (mLanguageAdapter != null) {
             mLanguageAdapter.notifyDataSetChanged();
         }

app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/accessibilityManager/settingAccessibilityController.java

@@ -130,6 +130,7 @@ public class settingAccessibilityController extends AppCompatActivity {
 
     @Override
     public void onResume() {
+        activityContextManager.getInstance().onCheckPurgeStack();
         pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_RESUME);
         activityContextManager.getInstance().setCurrentActivity(this);
         super.onResume();

app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/advanceManager/settingAdvanceController.java

@@ -109,6 +109,7 @@ public class settingAdvanceController extends AppCompatActivity {
 
     @Override
     public void onResume() {
+        activityContextManager.getInstance().onCheckPurgeStack();
         pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_RESUME);
         activityContextManager.getInstance().setCurrentActivity(this);
         super.onResume();

app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/clearManager/settingClearController.java

@@ -245,6 +245,7 @@ public class settingClearController extends AppCompatActivity {
 
     @Override
     public void onResume() {
+        activityContextManager.getInstance().onCheckPurgeStack();
         pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_RESUME);
         activityContextManager.getInstance().setCurrentActivity(this);
         super.onResume();

app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/generalManager/settingGeneralController.java

@@ -176,6 +176,7 @@ public class settingGeneralController extends AppCompatActivity {
 
     @Override
     public void onResume() {
+        activityContextManager.getInstance().onCheckPurgeStack();
         if (status.mThemeApplying) {
             // activityContextManager.getInstance().onStack(this);
         }

app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/logManager/settingLogController.java

@@ -95,6 +95,7 @@ public class settingLogController extends AppCompatActivity {
 
     @Override
     public void onResume() {
+        activityContextManager.getInstance().onCheckPurgeStack();
         pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_RESUME);
         activityContextManager.getInstance().setCurrentActivity(this);
         super.onResume();

app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/notificationManager/settingNotificationController.java

@@ -86,6 +86,7 @@ public class settingNotificationController extends AppCompatActivity {
 
     @Override
     public void onResume() {
+        activityContextManager.getInstance().onCheckPurgeStack();
         pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_RESUME);
         activityContextManager.getInstance().setCurrentActivity(this);
         super.onResume();

app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/privacyManager/settingPrivacyController.java

@@ -101,6 +101,7 @@ public class settingPrivacyController extends AppCompatActivity {
 
     @Override
     public void onResume() {
+        activityContextManager.getInstance().onCheckPurgeStack();
         if (mSettingChanged) {
             activityContextManager.getInstance().setCurrentActivity(this);
         }

app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/proxyStatusManager/proxyStatusController.java

@@ -109,6 +109,7 @@ public class proxyStatusController extends AppCompatActivity {
 
     @Override
     public void onResume() {
+        activityContextManager.getInstance().onCheckPurgeStack();
         pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_RESUME);
         super.onResume();
     }

app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/searchEngineManager/settingSearchController.java

@@ -98,6 +98,7 @@ public class settingSearchController extends AppCompatActivity {
 
     @Override
     public void onResume() {
+        activityContextManager.getInstance().onCheckPurgeStack();
         pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_RESUME);
         activityContextManager.getInstance().setCurrentActivity(this);
         super.onResume();

app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/settingHomeManager/settingHomeController.java

@@ -12,6 +12,7 @@ import androidx.appcompat.app.AppCompatDelegate;
 
 import com.hiddenservices.onionservices.appManager.activityContextManager;
 import com.hiddenservices.onionservices.appManager.helpManager.helpController;
+import com.hiddenservices.onionservices.appManager.homeManager.homeController.homeController;
 import com.hiddenservices.onionservices.appManager.settingManager.proxyStatusManager.proxyStatusController;
 import com.hiddenservices.onionservices.appManager.settingManager.accessibilityManager.settingAccessibilityController;
 import com.hiddenservices.onionservices.appManager.settingManager.advanceManager.settingAdvanceController;
@@ -151,6 +152,7 @@ public class settingHomeController extends AppCompatActivity {
 
     @Override
     public void onResume() {
+        activityContextManager.getInstance().onCheckPurgeStack();
         if (status.mThemeApplying) {
             // activityContextManager.getInstance().onStack(this);
         }
@@ -255,6 +257,12 @@ public class settingHomeController extends AppCompatActivity {
         activityContextManager.getInstance().getHomeController().onLoadURL(helperMethod.setGenesisVerificationToken(constants.CONST_SITEMAP));
     }
 
+    public void onReset(View view) {
+        activityContextManager.getInstance().getHomeController().onResetData();
+        pluginController.getInstance().onMessageManagerInvoke(null, M_RESET);
+        pluginController.getInstance().onMessageManagerInvoke(Collections.singletonList(this), M_PANIC_RESET);
+    }
+
     public void onPrivacyPolicy(View view) {
         finish();
         if (!status.sTorBrowsing) {

app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/trackingManager/settingTrackingController.java

@@ -90,6 +90,7 @@ public class settingTrackingController extends AppCompatActivity {
 
     @Override
     public void onResume() {
+        activityContextManager.getInstance().onCheckPurgeStack();
         if (mSettingChanged) {
             activityContextManager.getInstance().setCurrentActivity(this);
         }

app/src/main/java/com/hiddenservices/onionservices/pluginManager/pluginController.java

@@ -234,6 +234,9 @@ public class pluginController {
             if (pEventType.equals(enums.etype.welcome)) {
                 ((homeController) mHomeController.get()).onLoadURL(pData.get(0).toString());
             } else if (pEventType.equals(M_PANIC_RESET)) {
+                if(activityContextManager.getInstance().getSettingController()!=null){
+                    activityContextManager.getInstance().getSettingController().moveTaskToBack(true);
+                }
                 helperMethod.onDelayHandler(mHomeController.get(), 150, () -> {
                     activityContextManager.getInstance().getHomeController().panicExitInvoked();
                     return null;

app/src/main/res/anim/fade_in_lang.xml

@@ -1,8 +1,8 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android"
     android:startOffset="0">
     <alpha
-        android:duration="350"
+        android:duration="1350"
-        android:fromAlpha="0.0"
+        android:fromAlpha="0"
         android:interpolator="@android:anim/linear_interpolator"
-        android:toAlpha="1.0" />
+        android:toAlpha="1" />
 </set>

app/src/main/res/anim/fade_out_lang.xml

@@ -1,8 +1,8 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android"
     android:startOffset="0">
     <alpha
-        android:duration="350"
+        android:duration="1350"
         android:fromAlpha="1.0"
         android:interpolator="@android:anim/linear_interpolator"
-        android:toAlpha="0.5" />
+        android:toAlpha="0" />
 </set>

app/src/main/res/anim/translate_fade_left_crash.xml

@@ -0,0 +1,8 @@
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:startOffset="0">
+    <alpha
+        android:duration="1350"
+        android:fromAlpha="1"
+        android:interpolator="@android:anim/linear_interpolator"
+        android:toAlpha="1" />
+</set>

app/src/main/res/anim/translate_fade_right_crash.xml

@@ -0,0 +1,8 @@
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:startOffset="0">
+    <alpha
+        android:duration="300"
+        android:fromAlpha="1"
+        android:interpolator="@android:anim/linear_interpolator"
+        android:toAlpha="0" />
+</set>

app/src/main/res/custom-xml/images/xml/ic_baseline_location.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
+</vector>

app/src/main/res/custom-xml/images/xml/ic_baseline_proxy.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,18h2v-8h-2v8zM20,22h2v-2h-2v2zM2,22h16L18,8h4L22,2L2,22z"/>
+</vector>

app/src/main/res/custom-xml/images/xml/ic_baseline_theme.xml

@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M16.24,11.51l1.57,-1.57l-3.75,-3.75l-1.57,1.57L8.35,3.63c-0.78,-0.78 -2.05,-0.78 -2.83,0l-1.9,1.9c-0.78,0.78 -0.78,2.05 0,2.83l4.13,4.13L3,17.25V21h3.75l4.76,-4.76l4.13,4.13c0.95,0.95 2.23,0.6 2.83,0l1.9,-1.9c0.78,-0.78 0.78,-2.05 0,-2.83L16.24,11.51zM9.18,11.07L5.04,6.94l1.89,-1.9c0,0 0,0 0,0l1.27,1.27L7.02,7.5l1.41,1.41l1.19,-1.19l1.45,1.45L9.18,11.07zM17.06,18.96l-4.13,-4.13l1.9,-1.9l1.45,1.45l-1.19,1.19l1.41,1.41l1.19,-1.19l1.27,1.27L17.06,18.96z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.47,-0.47 -1.12,-0.29 -1.41,0l-1.83,1.83l3.75,3.75L20.71,7.04z"/>
+</vector>

app/src/main/res/layouts/help/layout-land/help_view.xml

@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/c_background"
+    android:clickable="true"
+    android:focusable="true"
+    tools:context="com.hiddenservices.onionservices.appManager.helpManager.helpController">
+
+    <!-- Title Header -->
+    <ProgressBar
+        android:id="@+id/pProgressBar"
+        style="?android:attr/progressBarStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.5" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/pRetryContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="40dp"
+        android:alpha="1"
+        android:background="@color/c_background"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/pHeaderContainerTop">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:src="@xml/ic_baseline_wifi_off"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="@color/c_alert_divider" />
+
+        <TextView
+            android:id="@+id/pErrorInfo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="30dp"
+            android:layout_marginBottom="40dp"
+            android:text="@string/HELP_RETRY_INFO"
+            android:textAlignment="center"
+            android:textColor="@color/c_text_v1"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="20dp"
+            android:orientation="horizontal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/pErrorInfo">
+
+            <ImageButton
+                android:id="@+id/pBrowser"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginStart="5dp"
+                android:background="@xml/hox_rounded_corner_suggestion_settings"
+                android:contentDescription="@string/GENERAL_TODO"
+                android:elevation="8dp"
+                android:onClick="onOpenHelpExternal"
+                android:src="@xml/ic_baseline_browser"
+                android:text="@string/HELP_RETRY"
+                android:textColor="@color/c_white"
+                app:tint="@color/c_white" />
+
+            <Button
+                android:id="@+id/pReloadButton"
+                android:layout_width="130dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginStart="15dp"
+                android:layout_marginTop="15dp"
+                android:background="@xml/hox_rounded_corner_suggestion_settings"
+                android:onClick="onReloadData"
+                android:text="@string/HELP_RETRY"
+                android:textColor="@color/c_white" />
+        </LinearLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <LinearLayout
+        android:id="@+id/pHeaderContainerTop"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:background="@color/c_background"
+        android:clickable="true"
+        android:elevation="8dp"
+        android:focusable="true"
+        android:orientation="horizontal"
+        android:paddingStart="5dp"
+        android:paddingEnd="7dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="RtlSymmetry">
+
+        <ImageButton
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="1dp"
+            android:background="@xml/gx_ripple_default_round"
+            android:contentDescription="@string/GENERAL_TODO"
+            android:onClick="onClose"
+            android:src="@xml/ic_arrow_back"
+            app:tint="@color/c_navigation_tint" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginTop="-3dp"
+            android:layout_marginEnd="10dp"
+            android:gravity="center_vertical|start"
+            android:onClick="onClose"
+            android:text="@string/HELP_TITLE"
+            android:textColor="@color/c_text_v1"
+            android:textSize="17sp"
+            android:textStyle="bold" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+        <ImageView
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="0dp"
+            android:background="@xml/gx_ripple_default_round"
+            android:contentDescription="@string/GENERAL_TODO"
+            android:onClick="onOpenHelp"
+            android:padding="9dp"
+            android:src="@xml/ic_baseline_chat"
+            app:tint="@color/c_header_icon_tint" />
+
+    </LinearLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/pNestedScroll"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="fill_vertical"
+        android:layout_marginTop="48dp"
+        android:clickable="true"
+        android:fillViewport="true"
+        android:focusable="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:focusable="true"
+            android:orientation="vertical">
+
+            <com.hiddenservices.onionservices.appManager.helpManager.editViewController
+                android:id="@+id/pSearchInput"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginBottom="2.5dp"
+                android:alpha="0"
+                android:background="@xml/gx_generic_input"
+                android:ems="10"
+                android:hint="@string/HISTORY_SEARCH_HINT"
+                android:importantForAutofill="no"
+                android:inputType="textNoSuggestions"
+                android:maxLines="1"
+                android:paddingStart="15dp"
+                android:paddingEnd="8dp"
+                android:textColor="@color/c_text_v1"
+                android:textColorHighlight="@color/c_text_color_highlight_v1"
+                android:textColorHint="@color/c_text_v2"
+                android:textCursorDrawable="@xml/gx_search_cursor_state"
+                android:textSize="15sp"
+                android:visibility="gone"
+                tools:targetApi="o" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/pRecycleView"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_marginTop="7dp"
+                android:layout_weight="1"
+                android:alpha="0"
+                android:background="@color/c_background"
+                android:clickable="true"
+                android:focusable="true">
+
+            </androidx.recyclerview.widget.RecyclerView>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layouts/help/layout/help_view.xml

@@ -3,10 +3,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:focusable="true"
-    android:clickable="true"
     android:layout_height="match_parent"
     android:background="@color/c_background"
+    android:clickable="true"
+    android:focusable="true"
     tools:context="com.hiddenservices.onionservices.appManager.helpManager.helpController">
 
     <!-- Title Header -->
@@ -24,24 +24,23 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/pRetryContainer"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
-        android:layout_marginTop="48dp"
+        android:layout_marginBottom="80dp"
         android:alpha="0"
         android:background="@color/c_background"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="@+id/pHeaderContainerTop">
 
         <ImageView
             android:id="@+id/imageView"
             android:layout_width="60dp"
             android:layout_height="60dp"
-            android:layout_marginBottom="165dp"
             android:src="@xml/ic_baseline_wifi_off"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
@@ -53,6 +52,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
+            android:layout_marginTop="30dp"
             android:layout_marginBottom="40dp"
             android:text="@string/HELP_RETRY_INFO"
             android:textAlignment="center"
@@ -65,36 +65,44 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <Button
+        <LinearLayout
-            android:id="@+id/pReloadButton"
+            android:layout_width="match_parent"
-            android:layout_width="130dp"
+            android:layout_height="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
-            android:layout_gravity="center_horizontal"
+            android:orientation="horizontal"
-            android:layout_marginStart="15dp"
+            app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginTop="15dp"
+            app:layout_constraintHorizontal_bias="0.5"
-            android:background="@xml/hox_rounded_corner_suggestion_settings"
+            app:layout_constraintStart_toStartOf="parent"
-            android:onClick="onReloadData"
+            app:layout_constraintTop_toBottomOf="@+id/pErrorInfo">
-            android:text="@string/HELP_RETRY"
+
-            android:textColor="@color/c_white"
+            <ImageButton
-            app:layout_constraintStart_toStartOf="@+id/pErrorInfo"
+                android:id="@+id/pBrowser"
-            app:layout_constraintTop_toBottomOf="@+id/pErrorInfo" />
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginStart="5dp"
+                android:background="@xml/hox_rounded_corner_suggestion_settings"
+                android:contentDescription="@string/GENERAL_TODO"
+                android:elevation="8dp"
+                android:onClick="onOpenHelpExternal"
+                android:src="@xml/ic_baseline_browser"
+                android:text="@string/HELP_RETRY"
+                android:textColor="@color/c_white"
+                app:tint="@color/c_white" />
+
+            <Button
+                android:id="@+id/pReloadButton"
+                android:layout_width="130dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginStart="15dp"
+                android:layout_marginTop="15dp"
+                android:background="@xml/hox_rounded_corner_suggestion_settings"
+                android:onClick="onReloadData"
+                android:text="@string/HELP_RETRY"
+                android:textColor="@color/c_white" />
+        </LinearLayout>
 
-        <ImageButton
-            android:id="@+id/pBrowser"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginStart="5dp"
-            android:background="@xml/hox_rounded_corner_suggestion_settings"
-            android:contentDescription="@string/GENERAL_TODO"
-            android:elevation="8dp"
-            android:onClick="onOpenHelpExternal"
-            android:src="@xml/ic_baseline_browser"
-            android:text="@string/HELP_RETRY"
-            android:textColor="@color/c_white"
-            app:layout_constraintStart_toEndOf="@+id/pReloadButton"
-            app:layout_constraintTop_toTopOf="@+id/pReloadButton"
-            app:tint="@color/c_white" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout
@@ -162,9 +170,9 @@
         android:layout_height="match_parent"
         android:layout_gravity="fill_vertical"
         android:layout_marginTop="48dp"
-        android:focusable="true"
         android:clickable="true"
         android:fillViewport="true"
+        android:focusable="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -173,8 +181,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:focusable="true"
             android:clickable="true"
+            android:focusable="true"
             android:orientation="vertical">
 
             <com.hiddenservices.onionservices.appManager.helpManager.editViewController
@@ -182,10 +190,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:layout_marginStart="10dp"
-                android:layout_marginEnd="10dp"
                 android:layout_marginTop="10dp"
-                android:alpha="0"
+                android:layout_marginEnd="10dp"
                 android:layout_marginBottom="2.5dp"
+                android:alpha="0"
                 android:background="@xml/gx_generic_input"
                 android:ems="10"
                 android:hint="@string/HISTORY_SEARCH_HINT"
@@ -206,12 +214,12 @@
                 android:id="@+id/pRecycleView"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:focusable="true"
-                android:clickable="true"
                 android:layout_marginTop="7dp"
                 android:layout_weight="1"
                 android:alpha="0"
-                android:background="@color/c_background">
+                android:background="@color/c_background"
+                android:clickable="true"
+                android:focusable="true">
 
             </androidx.recyclerview.widget.RecyclerView>
         </LinearLayout>

app/src/main/res/layouts/setting/layout/setting.xml

@@ -1151,6 +1151,76 @@
                 android:layout_marginStart="15dp"
                 android:background="@color/c_orbot_setting_divider" />
 
+            <LinearLayout
+                android:id="@+id/pOption18"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@xml/gx_ripple_gray"
+                android:onClick="onReset"
+                android:orientation="horizontal"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginStart="5dp"
+                    android:layout_marginEnd="5dp"
+                    android:contentDescription="@string/GENERAL_TODO"
+                    android:padding="10dp"
+                    android:src="@xml/ic_baseline_repair"
+                    app:tint="@color/c_setting_icon_tint" />
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="6"
+                    android:clickable="false"
+                    android:orientation="vertical">
+
+                    <Button
+                        android:layout_width="match_parent"
+                        android:layout_height="20dp"
+                        android:alpha="1"
+                        android:background="@android:color/transparent"
+                        android:clickable="false"
+                        android:padding="0dp"
+                        android:text="Fix and Reset"
+                        android:textAlignment="textStart"
+                        android:textAllCaps="false"
+                        android:textColor="@color/c_text_v1"
+                        android:textSize="15sp"
+                        tools:ignore="RtlSymmetry" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:alpha="1"
+                        android:background="@android:color/transparent"
+                        android:clickable="false"
+                        android:padding="0dp"
+                        android:text="Try to fix application by resetting settings"
+                        android:textAlignment="textStart"
+                        android:textAllCaps="false"
+                        android:textColor="@color/c_text_v6"
+                        android:textSize="13.5sp"
+                        tools:ignore="RtlSymmetry" />
+                </LinearLayout>
+
+                <ImageButton
+                    android:layout_width="45dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginEnd="5dp"
+                    android:background="@android:color/transparent"
+                    android:clickable="false"
+                    android:contentDescription="@string/GENERAL_TODO"
+                    android:src="@xml/ic_arrow_right"
+                    app:tint="@color/c_navigation_tint" />
+
+            </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"

app/variables.gradle

@@ -1,6 +1,6 @@
 /* Version */
-project.ext.vname = 'Build | Dark-Origin 1.0.5.0'
+project.ext.vname = 'Build | Dark-Origin 1.0.5.1'
-project.ext.vcode = 380
+project.ext.vcode = 390
 project.ext.buildType = 'release'
 
 /* dimension */