Tor routing can be blocked in China even when you are using default bridges.
This issue can be solved by connecting with Meek bridges. To do this GOTO
-
Connection Screen
➔ Gear
+
+
+ Connection Screen
➔ Gear
Icon
➔ Enable Bridges
➔ Customize bridges
➔ Meek-azure (China)
@@ -143,7 +152,9 @@
You can also provide custom bridges in Orion. To do this GOTO
- Connection Screen ➔ Gear
+
+
+ Connection Screen ➔ Gear
Icon ➔ Enable Bridges ➔ Customize bridges ➔ Paste custom bridge
Orion also provides a vpn from which you can secure data of other applications.
To do this GOTO
- Connection Screen ➔ Gear
+
+
+ Connection Screen ➔ Gear
Icon ➔ Enable VPN Service
diff --git a/app/src/main/assets/help/style/cs-help-dark.css b/app/src/main/assets/help/style/cs-help-dark.css
index 4a015611..c1ee1d25 100755
--- a/app/src/main/assets/help/style/cs-help-dark.css
+++ b/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;
- padding-left:15px;
+ margin-top: 10px;
+ padding-left:5px;
padding-bottom: 12px;
padding-top: 10px;
margin-bottom: 30px;
height: auto;
color:#d9d9d9;
- border-left: 5px solid #ff9933;
}
.hi_bullets{
diff --git a/app/src/main/assets/help/style/cs-help.css b/app/src/main/assets/help/style/cs-help.css
index 7d924008..c33bdac1 100755
--- a/app/src/main/assets/help/style/cs-help.css
+++ b/app/src/main/assets/help/style/cs-help.css
@@ -10,13 +10,12 @@
}
.hi_info{
- margin-top: 30px;
- padding-left:15px;
+ margin-top: 10px;
+ padding-left:5px;
padding-bottom: 12px;
padding-top: 10px;
margin-bottom: 30px;
height: auto;
- border-left: 5px solid #ff9933;
}
.hi_bullets{
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/activityContextManager.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/activityContextManager.java
index 3106bf4e..90410659 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/activityContextManager.java
+++ b/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) {
+ }
+ }
+ }
+ }
}
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/bookmarkManager/bookmarkHome/bookmarkController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/bookmarkManager/bookmarkHome/bookmarkController.java
index ec3dcb8d..7803cd5d 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/bookmarkManager/bookmarkHome/bookmarkController.java
+++ b/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;
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/bookmarkManager/bookmarkSettings/bookmarkSettingController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/bookmarkManager/bookmarkSettings/bookmarkSettingController.java
index 9c6ec058..062b1ba9 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/bookmarkManager/bookmarkSettings/bookmarkSettingController.java
+++ b/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();
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/bridgeManager/bridgeController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/bridgeManager/bridgeController.java
index 7ee0aa73..d8020599 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/bridgeManager/bridgeController.java
+++ b/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);
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/helpManager/helpAdapter.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/helpManager/helpAdapter.java
index 0aa93dff..2e07cda1 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/helpManager/helpAdapter.java
+++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/helpManager/helpAdapter.java
@@ -39,15 +39,20 @@ public class helpAdapter extends RecyclerView.Adapter
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);
- mSearchInvokedHandler.postDelayed(postToServerRunnable, 50);
+ mHelpAdapter.onTrigger(helpEnums.eHelpAdapter.M_INIT_FILTER, Collections.singletonList(mSearchInput.getText().toString()));
}
@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();
}
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/historyManager/historyController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/historyManager/historyController.java
index a178c1f3..275659a6 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/historyManager/historyController.java
+++ b/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;
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 9f2768f2..a9ab3eab 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
@@ -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);
}
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/geckoSession.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/geckoSession.java
index 3ca51ffa..e9847bd8 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/geckoSession.java
+++ b/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);
}
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 18b04be9..aa1b3996 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
@@ -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)));
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/languageManager/languageController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/languageManager/languageController.java
index 27a6b4c4..e624a34d 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/languageManager/languageController.java
+++ b/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();
}
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/accessibilityManager/settingAccessibilityController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/accessibilityManager/settingAccessibilityController.java
index 5bc9dd2f..1037556a 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/accessibilityManager/settingAccessibilityController.java
+++ b/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();
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/advanceManager/settingAdvanceController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/advanceManager/settingAdvanceController.java
index 6ef7a32d..2382413f 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/advanceManager/settingAdvanceController.java
+++ b/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();
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/clearManager/settingClearController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/clearManager/settingClearController.java
index 200edde5..e2e1073a 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/clearManager/settingClearController.java
+++ b/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();
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 104dc962..fbf2d291 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
@@ -176,6 +176,7 @@ public class settingGeneralController extends AppCompatActivity {
@Override
public void onResume() {
+ activityContextManager.getInstance().onCheckPurgeStack();
if (status.mThemeApplying) {
// activityContextManager.getInstance().onStack(this);
}
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/logManager/settingLogController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/logManager/settingLogController.java
index 628e268b..7c537c6a 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/logManager/settingLogController.java
+++ b/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();
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/notificationManager/settingNotificationController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/notificationManager/settingNotificationController.java
index aa0ebcfe..56685253 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/notificationManager/settingNotificationController.java
+++ b/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();
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/privacyManager/settingPrivacyController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/privacyManager/settingPrivacyController.java
index 9e2b01f0..b3e171f5 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/privacyManager/settingPrivacyController.java
+++ b/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);
}
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/proxyStatusManager/proxyStatusController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/proxyStatusManager/proxyStatusController.java
index 2bfd83aa..07c250b4 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/proxyStatusManager/proxyStatusController.java
+++ b/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();
}
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/searchEngineManager/settingSearchController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/searchEngineManager/settingSearchController.java
index c23d2e6e..01303e0f 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/searchEngineManager/settingSearchController.java
+++ b/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();
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/settingHomeManager/settingHomeController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/settingHomeManager/settingHomeController.java
index 4802bb1d..a476ed91 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/settingHomeManager/settingHomeController.java
+++ b/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) {
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/trackingManager/settingTrackingController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/trackingManager/settingTrackingController.java
index 72be3da2..75bb1ffb 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/trackingManager/settingTrackingController.java
+++ b/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);
}
diff --git a/app/src/main/java/com/hiddenservices/onionservices/pluginManager/pluginController.java b/app/src/main/java/com/hiddenservices/onionservices/pluginManager/pluginController.java
index 10cb7866..166f86cb 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/pluginManager/pluginController.java
+++ b/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;
diff --git a/app/src/main/res/anim/fade_in_lang.xml b/app/src/main/res/anim/fade_in_lang.xml
index 97f216cc..af275294 100644
--- a/app/src/main/res/anim/fade_in_lang.xml
+++ b/app/src/main/res/anim/fade_in_lang.xml
@@ -1,8 +1,8 @@
+ android:toAlpha="1" />
\ No newline at end of file
diff --git a/app/src/main/res/anim/fade_out_lang.xml b/app/src/main/res/anim/fade_out_lang.xml
index a713e33e..5d3e47d2 100644
--- a/app/src/main/res/anim/fade_out_lang.xml
+++ b/app/src/main/res/anim/fade_out_lang.xml
@@ -1,8 +1,8 @@
+ android:toAlpha="0" />
\ No newline at end of file
diff --git a/app/src/main/res/anim/translate_fade_left_crash.xml b/app/src/main/res/anim/translate_fade_left_crash.xml
new file mode 100644
index 00000000..8dd35362
--- /dev/null
+++ b/app/src/main/res/anim/translate_fade_left_crash.xml
@@ -0,0 +1,8 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/anim/translate_fade_right_crash.xml b/app/src/main/res/anim/translate_fade_right_crash.xml
new file mode 100644
index 00000000..03e34a2a
--- /dev/null
+++ b/app/src/main/res/anim/translate_fade_right_crash.xml
@@ -0,0 +1,8 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/custom-xml/images/xml/ic_baseline_location.xml b/app/src/main/res/custom-xml/images/xml/ic_baseline_location.xml
new file mode 100644
index 00000000..dd121133
--- /dev/null
+++ b/app/src/main/res/custom-xml/images/xml/ic_baseline_location.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/custom-xml/images/xml/ic_baseline_proxy.xml b/app/src/main/res/custom-xml/images/xml/ic_baseline_proxy.xml
new file mode 100644
index 00000000..08512b3a
--- /dev/null
+++ b/app/src/main/res/custom-xml/images/xml/ic_baseline_proxy.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/custom-xml/images/xml/ic_baseline_theme.xml b/app/src/main/res/custom-xml/images/xml/ic_baseline_theme.xml
new file mode 100644
index 00000000..d3ca206c
--- /dev/null
+++ b/app/src/main/res/custom-xml/images/xml/ic_baseline_theme.xml
@@ -0,0 +1,6 @@
+
+
+
+
diff --git a/app/src/main/res/drawable-hdpi/genesis.jpg b/app/src/main/res/drawable-hdpi/genesis.jpg
index da92ba2c..2878f91f 100644
Binary files a/app/src/main/res/drawable-hdpi/genesis.jpg and b/app/src/main/res/drawable-hdpi/genesis.jpg differ
diff --git a/app/src/main/res/drawable-hdpi/genesis_vector.jpg b/app/src/main/res/drawable-hdpi/genesis_vector.jpg
index cff7171c..b1414118 100644
Binary files a/app/src/main/res/drawable-hdpi/genesis_vector.jpg and b/app/src/main/res/drawable-hdpi/genesis_vector.jpg differ
diff --git a/app/src/main/res/drawable-hdpi/widget_ref.png b/app/src/main/res/drawable-hdpi/widget_ref.png
index 5fb9a5ef..381693cf 100644
Binary files a/app/src/main/res/drawable-hdpi/widget_ref.png and b/app/src/main/res/drawable-hdpi/widget_ref.png differ
diff --git a/app/src/main/res/layouts/help/layout-land/help_view.xml b/app/src/main/res/layouts/help/layout-land/help_view.xml
new file mode 100644
index 00000000..36fa5550
--- /dev/null
+++ b/app/src/main/res/layouts/help/layout-land/help_view.xml
@@ -0,0 +1,228 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/help/layout/help_view.xml b/app/src/main/res/layouts/help/layout/help_view.xml
index 36388f7e..b5b7d04d 100644
--- a/app/src/main/res/layouts/help/layout/help_view.xml
+++ b/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">
@@ -24,24 +24,23 @@
+ app:layout_constraintTop_toTopOf="@+id/pHeaderContainerTop">
-
+
+
+
+
+
+
-
+ android:background="@color/c_background"
+ android:clickable="true"
+ android:focusable="true">
diff --git a/app/src/main/res/layouts/setting/layout/setting.xml b/app/src/main/res/layouts/setting/layout/setting.xml
index 3c48764c..872e07de 100644
--- a/app/src/main/res/layouts/setting/layout/setting.xml
+++ b/app/src/main/res/layouts/setting/layout/setting.xml
@@ -1151,6 +1151,76 @@
android:layout_marginStart="15dp"
android:background="@color/c_orbot_setting_divider" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+