That's our privacy policy in a nutshell.
-
diff --git a/app/src/main/assets/readability/test/test-pages/medium-1/expected.html b/app/src/main/assets/readability/test/test-pages/medium-1/expected.html
index 986bee64..f0db8296 100755
--- a/app/src/main/assets/readability/test/test-pages/medium-1/expected.html
+++ b/app/src/main/assets/readability/test/test-pages/medium-1/expected.html
@@ -149,7 +149,7 @@
We’re still in the early stages of what this project will look like, so if you want to help or have thoughts, let’s talk.
-
pippin@pippinlee.com
+
pippin@pippinlee.com
This isn’t supposed to be a
manifesto™©
diff --git a/app/src/main/assets/readability/test/test-pages/medium-1/source.html b/app/src/main/assets/readability/test/test-pages/medium-1/source.html
index 63be9207..976ccc1d 100755
--- a/app/src/main/assets/readability/test/test-pages/medium-1/source.html
+++ b/app/src/main/assets/readability/test/test-pages/medium-1/source.html
@@ -608,7 +608,7 @@
We’re still in the early stages of what this project will look like, so if you want to help or have thoughts, let’s talk.
-
pippin@pippinlee.com
@@ -696,7 +696,7 @@
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/externalCommandManager/externalShortcutController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/externalCommandManager/externalShortcutController.java
index dd18d2e9..ec3103db 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/externalCommandManager/externalShortcutController.java
+++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/externalCommandManager/externalShortcutController.java
@@ -2,13 +2,8 @@ package com.hiddenservices.onionservices.appManager.externalCommandManager;
import android.content.Intent;
import android.os.Bundle;
-import android.os.Handler;
-import android.util.Log;
import android.view.View;
-
import androidx.appcompat.app.AppCompatActivity;
-
-import com.hiddenservices.onionservices.appManager.activityContextManager;
import com.hiddenservices.onionservices.appManager.homeManager.homeController.homeController;
import com.hiddenservices.onionservices.constants.constants;
import com.hiddenservices.onionservices.constants.status;
@@ -49,11 +44,11 @@ public class externalShortcutController extends AppCompatActivity {
return;
case constants.CONST_EXTERNAL_SHORTCUT_COMMAND_ERASE_OPEN:
panicExitInvoked();
- helperMethod.restartAndOpen(true);
+ helperMethod.restart(true, this);
break;
case constants.CONST_EXTERNAL_SHORTCUT_COMMAND_RESTART:
- helperMethod.restartAndOpen(false);
+ helperMethod.restart(false, this);
break;
}
}
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/externalCommandManager/externalURLNavigationContoller.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/externalCommandManager/externalURLNavigationContoller.java
index f69336f9..061e59e8 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/externalCommandManager/externalURLNavigationContoller.java
+++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/externalCommandManager/externalURLNavigationContoller.java
@@ -12,6 +12,8 @@ import android.util.Log;
import androidx.annotation.RequiresApi;
import androidx.appcompat.app.AppCompatActivity;
+
+import com.example.myapplication.R;
import com.hiddenservices.onionservices.appManager.activityContextManager;
import com.hiddenservices.onionservices.appManager.advertManager.advertController;
import com.hiddenservices.onionservices.appManager.homeManager.homeController.homeController;
@@ -21,6 +23,7 @@ import com.hiddenservices.onionservices.constants.status;
import com.hiddenservices.onionservices.constants.strings;
import com.hiddenservices.onionservices.helperManager.helperMethod;
+import static com.hiddenservices.onionservices.constants.constants.CONST_PACKAGE_NAME;
import static com.hiddenservices.onionservices.constants.keys.EXTERNAL_SHORTCUT_COMMAND_NAVIGATE;
public class externalURLNavigationContoller extends AppCompatActivity {
@@ -28,6 +31,8 @@ public class externalURLNavigationContoller extends AppCompatActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ com.widget.onionservices.helperMethod.helperMethod.onStartApplication(this, CONST_PACKAGE_NAME);
+
status.sExternalWebsite = strings.GENERIC_EMPTY_STR;
Uri mData = externalURLNavigationContoller.this.getIntent().getData();
if(status.sExternalWebsiteLoading && !status.sSettingIsAppStarted){
@@ -35,6 +40,7 @@ public class externalURLNavigationContoller extends AppCompatActivity {
intent.addFlags(FLAG_ACTIVITY_NO_ANIMATION);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_SINGLE_TOP);
startActivity(intent);
+ activityContextManager.getInstance().getHomeController().overridePendingTransition(R.anim.popup_scale_in, R.anim.popup_scale_out);
finish();
return;
}
@@ -45,6 +51,7 @@ public class externalURLNavigationContoller extends AppCompatActivity {
myIntent.addFlags(FLAG_ACTIVITY_NO_ANIMATION);
myIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
startActivity(myIntent);
+ activityContextManager.getInstance().getHomeController().overridePendingTransition(R.anim.popup_scale_in, R.anim.popup_scale_out);
}else {
if(mData == null){
mData = Uri.parse(constants.CONST_BACKEND_GENESIS_URL);
@@ -57,10 +64,8 @@ public class externalURLNavigationContoller extends AppCompatActivity {
status.sExternalWebsite = finalMData.toString();
helperMethod.onDelayHandler(this, 1500, () -> {
activityContextManager.getInstance().getHomeController().onStartApplication(null);
- activityContextManager.getInstance().getHomeController().onExternalURLInvoke(finalMData.toString());
return null;
});
-
}
else {
finish();
@@ -72,10 +77,7 @@ public class externalURLNavigationContoller extends AppCompatActivity {
});
helperMethod.onDelayHandler(this, 500, () -> {
- Intent intent = new Intent(this, homeController.class);
- intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
- intent.addFlags(FLAG_ACTIVITY_NO_ANIMATION);
- startActivity(intent);
+ com.widget.onionservices.helperMethod.helperMethod.onStartApplication(this, CONST_PACKAGE_NAME);
return null;
});
@@ -85,6 +87,7 @@ public class externalURLNavigationContoller extends AppCompatActivity {
helperMethod.onDelayHandler(this, 2500, () -> {
finish();
+ activityContextManager.getInstance().getHomeController().overridePendingTransition(R.anim.popup_scale_in, R.anim.popup_scale_out);
return null;
});
}
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/historyManager/historyAdapter.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/historyManager/historyAdapter.java
index 425ab0b4..0deb6edc 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/historyManager/historyAdapter.java
+++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/historyManager/historyAdapter.java
@@ -13,6 +13,7 @@ import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.RecyclerView;
+import com.hiddenservices.onionservices.constants.constants;
import com.hiddenservices.onionservices.constants.enums;
import com.hiddenservices.onionservices.constants.strings;
import com.hiddenservices.onionservices.dataManager.models.historyRowModel;
@@ -508,11 +509,20 @@ public class historyAdapter extends RecyclerView.Adapter
pData){
diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/searchEngineManager/settingSearchViewController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/searchEngineManager/settingSearchViewController.java
index e384f0bc..cd3ec3a2 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/searchEngineManager/settingSearchViewController.java
+++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/searchEngineManager/settingSearchViewController.java
@@ -77,6 +77,8 @@ class settingSearchViewController
}
if(status.sSearchSuggestionStatus){
mSearchSuggestions.setChecked(true);
+ }else {
+ mSearchHistory.setChecked(false);
}
}
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 d2f5dcc4..142676c1 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
@@ -264,7 +264,7 @@ public class settingHomeController extends AppCompatActivity
public void onPrivacyPolicy(View view) {
finish();
if(!status.sTorBrowsing){
- activityContextManager.getInstance().getHomeController().onLoadURL(helperMethod.setGenesisVerificationToken(constants.CONST_PRIVACY_POLICY_URL_NON_TOR));
+ activityContextManager.getInstance().getHomeController().onLoadURL(constants.CONST_PRIVACY_POLICY_URL_NON_TOR);
}else {
activityContextManager.getInstance().getHomeController().onLoadURL(helperMethod.setGenesisVerificationToken(constants.CONST_PRIVACY_POLICY_URL));
}
diff --git a/app/src/main/java/com/hiddenservices/onionservices/constants/constants.java b/app/src/main/java/com/hiddenservices/onionservices/constants/constants.java
index ef1fa4fc..9c09697b 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/constants/constants.java
+++ b/app/src/main/java/com/hiddenservices/onionservices/constants/constants.java
@@ -4,7 +4,7 @@ public class constants
{
/*LOCAL URL CONSTANTS*/
- public static final String CONST_PLAYSTORE_URL = "http://play.google.com/store/apps/details?id=com.hiddenservices.genesissearchengine.production";
+ public static final String CONST_PLAYSTORE_URL = "http://play.google.com/store/apps/details?id=com.hiddenservices.onionservices";
public static final String CONST_AMAZON_URL = "http://www.amazon.com/gp/mas/dl/android?p=com.darkweb.genesissearchengine.production";
public static final String CONST_SAMSUNG_URL = "http://www.samsungapps.com/appquery/appDetail.as?appId=com.darkweb.genesissearchengine.production";
public static final String CONST_HUAWEI_URL = "https://appgallery.cloud.huawei.com/uowap/index.html#/detailApp/C105664271?appId=C105664271";
diff --git a/app/src/main/java/com/hiddenservices/onionservices/constants/status.java b/app/src/main/java/com/hiddenservices/onionservices/constants/status.java
index 22cb5615..a0dea1ff 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/constants/status.java
+++ b/app/src/main/java/com/hiddenservices/onionservices/constants/status.java
@@ -18,7 +18,7 @@ public class status
public static boolean sPaidStatus = false;
public static boolean sDeveloperBuild = false;
- public static int sStoreType = enums.StoreType.SAMSUNG;
+ public static int sStoreType = enums.StoreType.GOOGLE_PLAY;
/*Settings Status*/
public static Locale mSystemLocale = null;
diff --git a/app/src/main/java/com/hiddenservices/onionservices/dataManager/historyDataModel.java b/app/src/main/java/com/hiddenservices/onionservices/dataManager/historyDataModel.java
index 97145ac2..5d8d5757 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/dataManager/historyDataModel.java
+++ b/app/src/main/java/com/hiddenservices/onionservices/dataManager/historyDataModel.java
@@ -90,6 +90,11 @@ public class historyDataModel {
}
private int addHistory(String pUrl,String pHeader, int pID) {
+
+ if(pUrl.startsWith(constants.CONST_GENESIS_URL_CACHED) || pUrl.startsWith(constants.CONST_GENESIS_URL_CACHED_DARK)){
+ pUrl = "https://genesis.onion";
+ }
+
if(pUrl.length()>1500 || pUrl.equals("about:blank") || pHeader.equals("$TITLE")){
return pID;
}
diff --git a/app/src/main/java/com/hiddenservices/onionservices/dataManager/suggestionDataModel.java b/app/src/main/java/com/hiddenservices/onionservices/dataManager/suggestionDataModel.java
index 8040295b..7ec4b465 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/dataManager/suggestionDataModel.java
+++ b/app/src/main/java/com/hiddenservices/onionservices/dataManager/suggestionDataModel.java
@@ -41,14 +41,18 @@ public class suggestionDataModel implements SpellCheckerSession.SpellCheckerSess
int sepPos = pQuery.indexOf(".");
if (sepPos == -1) {
mCurrentList.add( 0, new historyRowModel(pQuery+".com", strings.GENERIC_EMPTY_STR,-1));
- mCurrentList.add( 0, new historyRowModel(pQuery+".onion", strings.GENERIC_EMPTY_STR,-1));
+ if(status.sTorBrowsing){
+ mCurrentList.add( 0, new historyRowModel(pQuery+".onion", strings.GENERIC_EMPTY_STR,-1));
+ }
}else
{
if(!pQuery.equals(pQuery.substring(0,sepPos)+".com")){
mCurrentList.add( 0, new historyRowModel(pQuery.substring(0,sepPos)+".com", strings.GENERIC_EMPTY_STR,-1));
}
if(!pQuery.equals(pQuery.substring(0,sepPos)+".onion")){
- mCurrentList.add( 0, new historyRowModel(pQuery.substring(0,sepPos)+".onion", strings.GENERIC_EMPTY_STR,-1));
+ if(status.sTorBrowsing){
+ mCurrentList.add( 0, new historyRowModel(pQuery.substring(0,sepPos)+".onion", strings.GENERIC_EMPTY_STR,-1));
+ }
}
}
}
@@ -102,7 +106,9 @@ public class suggestionDataModel implements SpellCheckerSession.SpellCheckerSess
}
if(mCurrentList.size()<=0) {
- mCurrentList.add( mSize,new historyRowModel("Genesis Search", "genesis.onion",-1));
+ if(status.sTorBrowsing){
+ mCurrentList.add( mSize,new historyRowModel("Genesis Search", "genesis.onion",-1));
+ }
}
return mCurrentList;
@@ -223,7 +229,9 @@ public class suggestionDataModel implements SpellCheckerSession.SpellCheckerSess
}
}
if(mCurrentList.size()<=0) {
- mCurrentList.add( mSize,new historyRowModel("Genesis Search", "genesis.onion",-1));
+ if(status.sTorBrowsing){
+ mCurrentList.add( mSize,new historyRowModel("Genesis Search", "genesis.onion",-1));
+ }
}
return mCurrentList;
diff --git a/app/src/main/java/com/hiddenservices/onionservices/helperManager/helperMethod.java b/app/src/main/java/com/hiddenservices/onionservices/helperManager/helperMethod.java
index 35413a8a..9cd642c5 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/helperManager/helperMethod.java
+++ b/app/src/main/java/com/hiddenservices/onionservices/helperManager/helperMethod.java
@@ -440,7 +440,7 @@ public class helperMethod
selectorIntent.setData(Uri.parse("mailto:"));
final Intent emailIntent = new Intent(Intent.ACTION_SEND);
- emailIntent.putExtra(Intent.EXTRA_EMAIL, new String[]{"genesishiddentechnologies@gmail.com"});
+ emailIntent.putExtra(Intent.EXTRA_EMAIL, new String[]{"connectionslimited5@gmail.com"});
emailIntent.putExtra(Intent.EXTRA_SUBJECT, "Issue Report");
emailIntent.putExtra(Intent.EXTRA_TEXT, "Write Message Here....");
emailIntent.setSelector( selectorIntent );
@@ -1076,8 +1076,8 @@ public class helperMethod
return popupWindow;
}
- public static void restartAndOpen(boolean pOpenOnRestart) {
- ActivityManager manager = (ActivityManager) activityContextManager.getInstance().getHomeController().getSystemService(Context.ACTIVITY_SERVICE);
+ public static void restart(boolean pOpenOnRestart, Context pContext) {
+ ActivityManager manager = (ActivityManager) pContext.getSystemService(Context.ACTIVITY_SERVICE);
List runningProcesses = manager
.getRunningAppProcesses();
if (runningProcesses != null) {
@@ -1088,6 +1088,34 @@ public class helperMethod
}
}
+ Runtime.getRuntime().addShutdownHook(new Thread() {
+ @Override
+ public void run() {
+ super.run();
+
+ PackageManager packageManager = pContext.getPackageManager();
+ Intent intent = packageManager.getLaunchIntentForPackage(pContext.getPackageName());
+ ComponentName componentName = intent.getComponent();
+ Intent mainIntent = Intent.makeRestartActivityTask(componentName);
+ mainIntent.putExtra(M_RESTART_APP_KEY, pOpenOnRestart);
+ pContext.getApplicationContext().startActivity(mainIntent);
+ }
+ });
+ Runtime.getRuntime().exit(0);
+ System.exit(1);
+ }
+
+ public static void restartAndOpen(boolean pOpenOnRestart) {
+ ActivityManager manager = (ActivityManager) activityContextManager.getInstance().getHomeController().getSystemService(Context.ACTIVITY_SERVICE);
+ List runningProcesses = manager.getRunningAppProcesses();
+ if (runningProcesses != null) {
+ for (ActivityManager.RunningAppProcessInfo processInfo : runningProcesses) {
+ if (!BuildConfig.APPLICATION_ID.equalsIgnoreCase(processInfo.processName)) {
+ android.os.Process.killProcess(processInfo.pid);
+ }
+ }
+ }
+
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public void run() {
@@ -1103,6 +1131,7 @@ public class helperMethod
}
});
Runtime.getRuntime().exit(0);
+ System.exit(1);
}
}
diff --git a/app/src/main/java/com/hiddenservices/onionservices/pluginManager/messagePluginManager/messageManager.java b/app/src/main/java/com/hiddenservices/onionservices/pluginManager/messagePluginManager/messageManager.java
index 81d90500..8577f99d 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/pluginManager/messagePluginManager/messageManager.java
+++ b/app/src/main/java/com/hiddenservices/onionservices/pluginManager/messagePluginManager/messageManager.java
@@ -27,6 +27,7 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.constraintlayout.widget.ConstraintLayout;
import com.hiddenservices.onionservices.appManager.activityContextManager;
+import com.hiddenservices.onionservices.constants.constants;
import com.hiddenservices.onionservices.constants.enums;
import com.hiddenservices.onionservices.constants.status;
import com.hiddenservices.onionservices.constants.strings;
@@ -229,6 +230,17 @@ public class messageManager implements View.OnClickListener, DialogInterface.OnD
mBridgeMailPopupNext.setOnClickListener(this);
}
+ private void switchTorBrowsing()
+ {
+ initializeDialog(R.layout.popup_tor_change, Gravity.BOTTOM);
+
+ Button mBridgeMailPopupDismiss = mDialog.findViewById(R.id.pTorSwtichPopupDismiss);
+ Button mBridgeMailPopupNext = mDialog.findViewById(R.id.pTorSwtichPopupNext);
+
+ mBridgeMailPopupDismiss.setOnClickListener(this);
+ mBridgeMailPopupNext.setOnClickListener(this);
+ }
+
private void bookmark()
{
initializeDialog(R.layout.popup_create_bookmark, Gravity.CENTER);
@@ -240,6 +252,10 @@ public class messageManager implements View.OnClickListener, DialogInterface.OnD
mDialog.setOnShowListener(dialog -> mContext.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING));
String mURL = mData.get(0).toString().replace(CONST_GENESIS_ONION,CONST_GENESIS_ONION_V2);
+
+ if(mURL.startsWith(constants.CONST_PRIVACY_POLICY_URL_NON_TOR)){
+ mURL = "https://genesis.onion/privacy";
+ }
mPopupCreateBookmarkURL.setText(mURL);
mDialog.setOnDismissListener(this);
@@ -467,6 +483,7 @@ public class messageManager implements View.OnClickListener, DialogInterface.OnD
view.getId() == R.id.pPopupRateFailureDismiss ||
view.getId() == R.id.pPopupPanicDismiss ||
view.getId() == R.id.pDownloadPopuInfoDismiss ||
+ view.getId() == R.id.pTorSwtichPopupDismiss ||
view.getId() == R.id.pPopupURLLongPressDismiss ||
view.getId() == R.id.pPopupLongPressDismiss ||
view.getId() == R.id.pCertificateDesciption ||
@@ -488,6 +505,10 @@ public class messageManager implements View.OnClickListener, DialogInterface.OnD
mEvent.invokeObserver(mData, M_PANIC_RESET);
onClearReference();
}
+ else if(view.getId() == R.id.pTorSwtichPopupNext){
+ onDismiss();
+ mEvent.invokeObserver(null, M_TOR_SWITCH_RESTART);
+ }
else if(view.getId() == R.id.pPopupCreateBookmarkDismiss){
onDismiss();
helperMethod.hideKeyboard(mContext);
@@ -547,6 +568,9 @@ public class messageManager implements View.OnClickListener, DialogInterface.OnD
EditText mPopupCreateBookmarkInput = mDialog.findViewById(R.id.pPopupCreateBookmarkInput);
String mBookmarkName = mPopupCreateBookmarkInput.getText().toString();
String mURL = mData.get(0).toString().replace(CONST_GENESIS_ONION,CONST_GENESIS_ONION_V2);
+ if(mURL.startsWith(constants.CONST_PRIVACY_POLICY_URL_NON_TOR)){
+ mURL = "https://genesis.onion/privacy";
+ }
mEvent.invokeObserver(Arrays.asList(mURL, mBookmarkName), M_BOOKMARK);
}
else if(view.getId() == R.id.pPopupRateusNext){
@@ -557,10 +581,6 @@ public class messageManager implements View.OnClickListener, DialogInterface.OnD
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(mStoreURL));
try {
mContext.startActivity(intent);
- helperMethod.onDelayHandler(mContext, 500, () -> {
- mContext.finish();
- return null;
- });
} catch (Exception ignored) {
helperMethod.showToastMessage(MESSAGE_PLAYSTORE_NOT_FOUND, mContext);
}
@@ -877,6 +897,11 @@ public class messageManager implements View.OnClickListener, DialogInterface.OnD
onShowToast(R.layout.popup_toast_generic,R.xml.ax_background_generic, 2000, mContext.getString(R.string.TOAST_ALERT_CICADA), mContext.getString(R.string.ALERT_DISMISS), null);
break;
+ case M_TOR_SWITCH:
+ /*VERIFIED*/
+ switchTorBrowsing();
+ break;
+
case M_OPEN_ACTIVITY_FAILED:
/*VERIFIED*/
onShowToast(R.layout.popup_toast_generic,R.xml.ax_background_generic, 2000, mContext.getString(R.string.TOAST_ALERT_OPEN_ACTIVITY_FAILED), mContext.getString(R.string.ALERT_DISMISS), null);
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 d8bb24f7..25e86add 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/pluginManager/pluginController.java
+++ b/app/src/main/java/com/hiddenservices/onionservices/pluginManager/pluginController.java
@@ -342,8 +342,19 @@ public class pluginController
mHomeController.get().runOnUiThread(() -> mHomeController.get().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE));
}
else if(pEventType.equals(M_IMAGE_UPDATE_RESTART)){
- onOrbotInvoke(Collections.singletonList(status.mThemeApplying), pluginEnums.eOrbotManager.M_DESTROY);
- helperMethod.restartAndOpen(false);
+ helperMethod.onDelayHandler(mHomeController.get(), 250, () -> {
+ onOrbotInvoke(Collections.singletonList(status.mThemeApplying), pluginEnums.eOrbotManager.M_DESTROY);
+ helperMethod.restartAndOpen(false);
+ return null;
+ });
+ }
+ else if(pEventType.equals(M_TOR_SWITCH_RESTART)){
+ activityContextManager.getInstance().getHomeController().torSwitch();
+ helperMethod.onDelayHandler(mHomeController.get(), 250, () -> {
+ onOrbotInvoke(Collections.singletonList(status.mThemeApplying), pluginEnums.eOrbotManager.M_DESTROY);
+ helperMethod.restartAndOpen(false);
+ return null;
+ });
}
return null;
}
diff --git a/app/src/main/java/com/hiddenservices/onionservices/pluginManager/pluginEnums.java b/app/src/main/java/com/hiddenservices/onionservices/pluginManager/pluginEnums.java
index 913180b5..c9b6df36 100644
--- a/app/src/main/java/com/hiddenservices/onionservices/pluginManager/pluginEnums.java
+++ b/app/src/main/java/com/hiddenservices/onionservices/pluginManager/pluginEnums.java
@@ -27,7 +27,7 @@ public class pluginEnums
/*Message Manager*/
public enum eMessageManager{
- M_RESET, M_DATA_CLEARED, M_COPY, M_APPLICATION_CRASH, M_DELETE_BOOKMARK, M_UPDATE_BOOKMARK, M_IMAGE_UPDATE,M_OPEN_ACTIVITY_FAILED, M_OPEN_CICADA, M_SECURE_CONNECTION, M_SECURITY_INFO, M_POPUP_BLOCKED, M_PANIC, M_MAX_TAB_REACHED, M_ORBOT_LOADING, M_LOAD_NEW_TAB, M_UNDO,M_DOWNLOAD_SINGLE, M_UPDATE_BRIDGES, M_NEW_IDENTITY, M_NOT_SUPPORTED, M_BRIDGE_MAIL, M_LONG_PRESS_WITH_LINK, M_LONG_PRESS_URL, M_LONG_PRESS_DOWNLOAD, M_START_ORBOT, M_DOWNLOAD_FAILURE, M_DOWNLOAD_FILE, M_RATE_APP, M_REPORT_URL, M_CLEAR_BOOKMARK, M_CLEAR_HISTORY, M_BOOKMARK, M_PANIC_RESET, M_RATE_SUCCESS, M_RATE_FAILURE, M_CLOSE, M_LANGUAGE_SUPPORT_FAILURE, M_WELCOME
+ M_RESET, M_DATA_CLEARED, M_COPY, M_APPLICATION_CRASH, M_DELETE_BOOKMARK, M_UPDATE_BOOKMARK, M_IMAGE_UPDATE,M_OPEN_ACTIVITY_FAILED, M_OPEN_CICADA, M_TOR_SWITCH, M_SECURE_CONNECTION, M_SECURITY_INFO, M_POPUP_BLOCKED, M_PANIC, M_MAX_TAB_REACHED, M_ORBOT_LOADING, M_LOAD_NEW_TAB, M_UNDO,M_DOWNLOAD_SINGLE, M_UPDATE_BRIDGES, M_NEW_IDENTITY, M_NOT_SUPPORTED, M_BRIDGE_MAIL, M_LONG_PRESS_WITH_LINK, M_LONG_PRESS_URL, M_LONG_PRESS_DOWNLOAD, M_START_ORBOT, M_DOWNLOAD_FAILURE, M_DOWNLOAD_FILE, M_RATE_APP, M_REPORT_URL, M_CLEAR_BOOKMARK, M_CLEAR_HISTORY, M_BOOKMARK, M_PANIC_RESET, M_TOR_SWITCH_RESTART, M_RATE_SUCCESS, M_RATE_FAILURE, M_CLOSE, M_LANGUAGE_SUPPORT_FAILURE, M_WELCOME
}
public enum eMessageManagerCallbacks{
diff --git a/app/src/main/res/anim/popup_scale_in.xml b/app/src/main/res/anim/popup_scale_in.xml
index 133ca1d2..c99cbf9a 100644
--- a/app/src/main/res/anim/popup_scale_in.xml
+++ b/app/src/main/res/anim/popup_scale_in.xml
@@ -4,9 +4,9 @@
android:fillEnabled="true">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/bookmark/layout/bookmark_row_view.xml b/app/src/main/res/layouts/bookmark/layout/bookmark_row_view.xml
index 022244b3..bd17462d 100644
--- a/app/src/main/res/layouts/bookmark/layout/bookmark_row_view.xml
+++ b/app/src/main/res/layouts/bookmark/layout/bookmark_row_view.xml
@@ -63,7 +63,7 @@