From b434a62b26a7af34d72f749b1faa035129965be8 Mon Sep 17 00:00:00 2001 From: Abdul Mannan Saeed <111820160@umt.edu.pk> Date: Mon, 18 Apr 2022 12:00:09 -0700 Subject: [PATCH] Bug Fixes Bug Fixes --- .idea/inspectionProfiles/Project_Default.xml | 2 + .idea/misc.xml | 8 + .../bridgeManager/bridgeController.java | 4 +- .../externalShortcutController.java | 22 +-- .../geckoManager/geckoClients.java | 19 ++- .../homeController/homeController.java | 47 +++++- .../homeController/homeViewController.java | 33 +++- .../clearManager/settingClearController.java | 1 + .../settingGeneralController.java | 4 +- .../settingSearchController.java | 15 +- .../settingSearchViewController.java | 34 ++-- .../onionservices/constants/keys.java | 7 +- .../onionservices/constants/status.java | 5 + .../dataManager/dataController.java | 1 + .../helperManager/helperMethod.java | 35 +++- .../downloadReciever.java | 30 +++- .../orbotPluginManager/orbotManager.java | 32 ++-- .../pluginManager/pluginController.java | 11 +- app/src/main/res/drawable-hdpi/tor_logo.png | Bin 0 -> 52780 bytes .../bridge/layout/bridge_settings_view.xml | 4 +- .../res/layouts/home/layout/home_view.xml | 11 ++ .../layouts/home/layout/popup_side_menu.xml | 73 ++++++++- .../res/layouts/setting/layout/setting.xml | 8 +- .../layout/setting_accessibility_view.xml | 6 +- .../setting/layout/setting_advance_view.xml | 6 +- .../setting/layout/setting_clear_view.xml | 10 +- .../setting/layout/setting_general_view.xml | 6 +- .../setting/layout/setting_privacy_view.xml | 10 +- .../setting/layout/setting_search_view.xml | 10 +- .../setting/layout/setting_tracking_view.xml | 2 +- .../res/layouts/tab/layout/tab_grid_view.xml | 2 +- app/src/main/res/values-ar/strings.xml | 4 +- app/src/main/res/values-ca/strings.xml | 7 +- app/src/main/res/values-ch/strings.xml | 4 +- app/src/main/res/values-de/strings.xml | 4 +- app/src/main/res/values-el/strings.xml | 4 +- app/src/main/res/values-fr/strings.xml | 4 +- app/src/main/res/values-hu/strings.xml | 6 +- app/src/main/res/values-in-rID/strings.xml | 8 +- app/src/main/res/values-it/strings.xml | 6 +- app/src/main/res/values-ja-rJP/strings.xml | 3 +- app/src/main/res/values-ko/strings.xml | 6 +- app/src/main/res/values-nl/strings.xml | 6 +- app/src/main/res/values-pt/strings.xml | 6 +- app/src/main/res/values-ro/strings.xml | 6 +- app/src/main/res/values-ru/strings.xml | 6 +- app/src/main/res/values-th/strings.xml | 6 +- app/src/main/res/values-tr/strings.xml | 4 +- app/src/main/res/values-uk/strings.xml | 6 +- app/src/main/res/values-ur/strings.xml | 1 + app/src/main/res/values-vi/strings.xml | 4 +- app/src/main/res/values-zh/strings.xml | 6 +- app/src/main/res/values/strings.xml | 37 ++--- .../android/service/OrbotService.java | 155 +++++++++++------- .../service/wrapper/orbotLocalConstants.java | 2 +- orbotmanager/src/main/res/values/strings.xml | 4 +- 56 files changed, 485 insertions(+), 278 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/tor_logo.png diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 3d6e49dc..53049cc8 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -9,6 +9,7 @@ + + diff --git a/.idea/misc.xml b/.idea/misc.xml index b2630b0c..53531625 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -78,7 +78,15 @@ + + + + + + + + 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 b6ad76c2..50c2e8dd 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 @@ -145,7 +145,7 @@ public class bridgeController extends AppCompatActivity implements View.OnFocusC mBridgeModel.onTrigger(bridgeEnums.eBridgeModelCommands.M_REQUEST_BRIDGE, null); pluginController.getInstance().onMessageManagerInvoke(Arrays.asList(constants.CONST_BACKEND_GOOGLE_URL, this), M_BRIDGE_MAIL); } - else if(view.getId() == R.id.pBridgeSettingOption2){ + else if(view.getId() == R.id.pSearchSettingOption2){ mBridgeModel.onTrigger(bridgeEnums.eBridgeModelCommands.M_MEEK_BRIDGE, null); mBridgeViewController.onTrigger(bridgeEnums.eBridgeViewCommands.M_INIT_VIEWS, Arrays.asList(status.sBridgeCustomBridge,250, status.sBridgeCustomType)); } @@ -153,7 +153,7 @@ public class bridgeController extends AppCompatActivity implements View.OnFocusC mBridgeModel.onTrigger(bridgeEnums.eBridgeModelCommands.M_SNOWFLAKES_BRIDGE, null); mBridgeViewController.onTrigger(bridgeEnums.eBridgeViewCommands.M_INIT_VIEWS, Arrays.asList(status.sBridgeCustomBridge,250, status.sBridgeCustomType)); } - else if(view.getId() == R.id.pBridgeSettingOption1){ + else if(view.getId() == R.id.pSearchSettingOption1){ mBridgeModel.onTrigger(bridgeEnums.eBridgeModelCommands.M_OBFS_CHECK, null); mBridgeViewController.onTrigger(bridgeEnums.eBridgeViewCommands.M_INIT_VIEWS, Arrays.asList(status.sBridgeCustomBridge,250, status.sBridgeCustomType)); } 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 547ccd39..dd18d2e9 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,6 +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; @@ -39,29 +41,31 @@ public class externalShortcutController extends AppCompatActivity { case CONST_EXTERNAL_SHORTCUT_COMMAND_ERASE: setContentView(R.layout.popup_data_cleared_shortcut); panicExitInvoked(); + helperMethod.onDelayHandler(this, 3000, () -> { + finishAndRemoveTask(); + return null; + }); + return; case constants.CONST_EXTERNAL_SHORTCUT_COMMAND_ERASE_OPEN: - setContentView(R.layout.empty_view); panicExitInvoked(); + helperMethod.restartAndOpen(true); + break; case constants.CONST_EXTERNAL_SHORTCUT_COMMAND_RESTART: - activityContextManager.getInstance().onClearStack(); + helperMethod.restartAndOpen(false); break; } } } - /* Start Required Activity */ - - helperMethod.openIntent(mIntent, this, constants.CONST_LIST_EXTERNAL_SHORTCUT); - } /* UI TRIGGERS */ public void onUITrigger(View view){ if(view.getId() == R.id.pDataClearedDismiss){ - finishAffinity(); + finishAndRemoveTask(); } } @@ -69,9 +73,5 @@ public class externalShortcutController extends AppCompatActivity { public void panicExitInvoked() { dataController.getInstance().clearData(this); - helperMethod.onDelayHandler(this, 3000, () -> { - finish(); - return null; - }); } } \ No newline at end of file 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 032237a9..ce975e33 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 @@ -186,15 +186,17 @@ public class geckoClients } String mYAML = helperMethod.readFromFile(cacheFile.getPath()); - mYAML = mYAML.replace("# network.proxy.socks: \"127.0.0.1\"","network.proxy.socks: \"127.0.0.1\""); - mYAML = mYAML.replace("# network.proxy.socks_port: 9050","network.proxy.socks_port: 9050"); - mYAML = mYAML.replace("network.proxy.socks: \"127.0.0.1\"","network.proxy.socks: \"127.0.0.1\""); + if(status.sTorBrowsing){ + mYAML = mYAML.replace("# network.proxy.socks: \"127.0.0.1\"","network.proxy.socks: \"127.0.0.1\""); + mYAML = mYAML.replace("# network.proxy.socks_port: 9050","network.proxy.socks_port: 9050"); + + StringBuilder buf = new StringBuilder(mYAML); + int portIndex = mYAML.indexOf("network.proxy.socks_port"); + int breakIndex = mYAML.indexOf("\n",portIndex); + mYAML = buf.replace(portIndex, breakIndex,"network.proxy.socks_port: "+ orbotLocalConstants.mSOCKSPort).toString(); + helperMethod.writeToFile(cacheFile.getPath(), mYAML); + } - StringBuilder buf = new StringBuilder(mYAML); - int portIndex = mYAML.indexOf("network.proxy.socks_port"); - int breakIndex = mYAML.indexOf("\n",portIndex); - mYAML = buf.replace(portIndex, breakIndex,"network.proxy.socks_port: "+ orbotLocalConstants.mSOCKSPort).toString(); - helperMethod.writeToFile(cacheFile.getPath(), mYAML); return cacheFile.getAbsolutePath(); @@ -408,6 +410,7 @@ public class geckoClients if(mSession==null){ return; } + Log.i("FERROR : ", "FERROR" + url); if(mSession.onGetInitializeFromStartup()){ mSession.initURL(url); if(!url.startsWith(CONST_REPORT_URL) && (url.startsWith("http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/?pG") || url.startsWith("https://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion?pG") || url.endsWith("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") || url.endsWith(constants.CONST_GENESIS_DOMAIN_URL_SLASHED))){ 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 e77a50d3..49cef756 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 @@ -121,6 +121,7 @@ import static com.hiddenservices.onionservices.constants.enums.etype.open_new_ta import static com.hiddenservices.onionservices.constants.keys.EXTERNAL_SHORTCUT_COMMAND; import static com.hiddenservices.onionservices.constants.keys.EXTERNAL_SHORTCUT_COMMAND_NAVIGATE; import static com.hiddenservices.onionservices.constants.keys.M_ACTIVITY_RESPONSE; +import static com.hiddenservices.onionservices.constants.keys.M_RESTART_APP_KEY; import static com.hiddenservices.onionservices.constants.responses.BOOKMARK_SETTING_CONTROLLER_SHOW_DELETE_ALERT; import static com.hiddenservices.onionservices.constants.responses.BOOKMARK_SETTING_CONTROLLER_SHOW_SUCCESS_ALERT; import static com.hiddenservices.onionservices.constants.sql.SQL_CLEAR_HISTORY; @@ -182,6 +183,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba private ImageView mImageDivider; private ImageButton mPopoupFindCopy; private ImageButton mPopoupFindPaste; + private ImageView mTorDisabled; /*Redirection Objects*/ private GeckoResult mRenderedBitmap = null; @@ -244,6 +246,14 @@ public class homeController extends AppCompatActivity implements ComponentCallba status.sSettingIsAppRunning = true; initPreFixes(); initBundle(); + initTor(); + + } + + public void initTor(){ + if(!status.sTorBrowsing){ + onStartApplication(null); + } } public void initBundle(){ @@ -261,8 +271,15 @@ public class homeController extends AppCompatActivity implements ComponentCallba status.sExternalWebsite = mShortcutCommandNavigate; onStartApplication(null); } + if(getIntent().getExtras().containsKey(M_RESTART_APP_KEY)){ + boolean mStatus = getIntent().getExtras().getBoolean(M_RESTART_APP_KEY); + if(mStatus){ + onStartApplication(null); + } + } } getIntent().setData(null); + } public boolean isSplashScreenLoading(){ @@ -513,13 +530,14 @@ public class homeController extends AppCompatActivity implements ComponentCallba mGenesisLogo = findViewById(R.id.pGenesisLogo); mPopoupFindCopy = findViewById(R.id.pPopoupFindCopy); mPopoupFindPaste = findViewById(R.id.pPopoupFindPaste); + mTorDisabled = findViewById(R.id.pTorDisabled); mGeckoView.setSaveEnabled(false); mGeckoView.setSaveFromParentEnabled(false); mGeckoView.setAutofillEnabled(true); mGeckoClient = new geckoClients(); - mHomeViewController.initialization(new homeViewCallback(),this,mNewTab, mWebViewContainer, mLoadingText, mProgressBar, mSearchbar, mSplashScreen, mLoadingIcon, mBannerAds, mGatewaySplash, mTopBar, mGeckoView, mBackSplash, mConnectButton, mFindBar, mFindText, mFindCount, mTopLayout, mVoiceInput, mMenu, mNestedScroll, mBlocker, mBlockerFullSceen, mSearchEngineBar, mCopyright, mHintListView, mAppBar, mOrbotLogManager, mInfoLandscape, mInfoPortrait, mProgressBarIndeterminate, mTabFragment, mTopBarContainer, mSearchLock, mTopBarHider, mNewTabBlocker, mCoordinatorLayout, mImageDivider, mPanicButton, mGenesisLogo, mPanicButtonLandscape); + mHomeViewController.initialization(new homeViewCallback(),this,mNewTab, mWebViewContainer, mLoadingText, mProgressBar, mSearchbar, mSplashScreen, mLoadingIcon, mBannerAds, mGatewaySplash, mTopBar, mGeckoView, mBackSplash, mConnectButton, mFindBar, mFindText, mFindCount, mTopLayout, mVoiceInput, mMenu, mNestedScroll, mBlocker, mBlockerFullSceen, mSearchEngineBar, mCopyright, mHintListView, mAppBar, mOrbotLogManager, mInfoLandscape, mInfoPortrait, mProgressBarIndeterminate, mTabFragment, mTopBarContainer, mSearchLock, mTopBarHider, mNewTabBlocker, mCoordinatorLayout, mImageDivider, mPanicButton, mGenesisLogo, mPanicButtonLandscape, mTorDisabled); mGeckoView.onSetHomeEvent(new nestedGeckoViewCallback()); mGeckoClient.initialize(mGeckoView, new geckoViewCallback(), this,false); mGeckoClient.onValidateInitializeFromStartup(mGeckoView, homeController.this); @@ -1712,7 +1730,6 @@ public class homeController extends AppCompatActivity implements ComponentCallba mBlocker.setClickable(true); mBlocker.setFocusable(true); mBlocker.setEnabled(true); - Log.i("FUCKKKKK","SADADS3"); } static boolean mStateService = false; @@ -1727,12 +1744,19 @@ public class homeController extends AppCompatActivity implements ComponentCallba } } - mHomeViewController.initHomePage(); + Log.i("fuck","fuck"); + if(status.sTorBrowsing){ + mHomeViewController.initHomePage(); + } + int mDelay = 1000; + if(!status.sTorBrowsing){ + mDelay = 0; + } new Handler().postDelayed(() -> { pluginController.getInstance().onOrbotInvoke(Arrays.asList(status.sBridgeCustomBridge, status.sBridgeGatewayManual, status.sBridgeCustomType, status.sBridgeStatus, status.sShowImages, status.sClearOnExit, (String)dataController.getInstance().invokeBridges(dataEnums.eBridgeWebsiteCommands.M_FETCH, null)), pluginEnums.eOrbotManager.M_START_ORBOT); onInvokeProxyLoading(); - }, 1000); + }, mDelay); } public void onDownloadFile(){ @@ -1874,6 +1898,18 @@ public class homeController extends AppCompatActivity implements ComponentCallba onNewTab(isKeyboardOpened, true); } } + else if (menuId == R.id.menu29) { + if(status.sTorBrowsing){ + status.sTorBrowsing = false; + dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_STRING, Arrays.asList(keys.SETTING_SEARCH_ENGINE, constants.CONST_BACKEND_DUCK_DUCK_GO_URL)); + }else { + status.sTorBrowsing = true; + dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_STRING, Arrays.asList(keys.SETTING_SEARCH_ENGINE, constants.CONST_BACKEND_GENESIS_URL)); + } + + dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_TOR_BROWSING,status.sTorBrowsing)); + pluginController.getInstance().onMessageManagerInvoke(Collections.singletonList(this), M_IMAGE_UPDATE); + } else if (menuId == R.id.menuItem25) { String mFileName = DownloadUtils.guessFileName(null,"",mGeckoClient.getSession().getCurrentURL(),null); String mURL = mGeckoClient.getSession().getCurrentURL(); @@ -1930,6 +1966,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba pluginController.getInstance().onOrbotInvoke(null, pluginEnums.eOrbotManager.M_NEW_CIRCUIT); pluginController.getInstance().onMessageManagerInvoke(Collections.singletonList(this), M_NEW_IDENTITY); mGeckoClient.onReload(mGeckoView, this, false); + onLoadURL(mSearchbar.getText().toString()); } else if (menuId == R.id.pMenuOpenCurrentTab) { @@ -2105,6 +2142,8 @@ public class homeController extends AppCompatActivity implements ComponentCallba dataController.getInstance().invokeSQLCipher(dataEnums.eSqlCipherCommands.M_EXEC_SQL, Arrays.asList(SQL_CLEAR_HISTORY,null)); dataController.getInstance().invokeHistory(dataEnums.eHistoryCommands.M_CLEAR_HISTORY ,null); dataController.getInstance().invokeTab(dataEnums.eTabCommands.M_CLEAR_TAB, null); + dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_INSTALLED,false)); + dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_TOR_BROWSING,true)); mGeckoClient.onClearAll(); activityContextManager.getInstance().getHomeController().onClearCache(); diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeViewController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeViewController.java index d22d701a..8b34dc87 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeViewController.java +++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeViewController.java @@ -110,6 +110,7 @@ class homeViewController private ImageButton mPanicButton; private ImageButton mPanicButtonLandscape; private ImageView mGenesisLogo; + private ImageView mTorDisabled; /*Local Variables*/ private Callable mLogs = null; @@ -119,7 +120,7 @@ class homeViewController private boolean mIsTopBarExpanded = true; private NestedScrollView.MarginLayoutParams mDefaultMargin = null; - void initialization(eventObserver.eventListener event, AppCompatActivity context, Button mNewTab, ConstraintLayout webviewContainer, TextView loadingText, ProgressBar progressBar, editTextManager searchbar, ConstraintLayout splashScreen, ImageView loading, MaxAdView banner_ads, ImageButton gateway_splash, LinearLayout top_bar, GeckoView gecko_view, ImageView backsplash, Button connect_button, View pFindBar, EditText pFindText, TextView pFindCount, androidx.constraintlayout.widget.ConstraintLayout pTopLayout, ImageButton pVoiceInput, ImageButton pMenu, androidx.core.widget.NestedScrollView pNestedScroll, ImageView pBlocker, ImageView pBlockerFullSceen, View mSearchEngineBar, TextView pCopyright, RecyclerView pHistListView, com.google.android.material.appbar.AppBarLayout pAppBar, ImageButton pOrbotLogManager, ConstraintLayout pInfoLandscape, ConstraintLayout pInfoPortrait, ProgressBar pProgressBarIndeterminate, FragmentContainerView pTabFragment, LinearLayout pTopBarContainer, ImageView pSearchLock, ImageView pTopBarHider, ImageView pNewTabBlocker, CoordinatorLayout mCoordinatorLayout, ImageView pImageDivider, ImageButton pPanicButton, ImageView pGenesisLogo, ImageButton pPanicButtonLandscape){ + void initialization(eventObserver.eventListener event, AppCompatActivity context, Button mNewTab, ConstraintLayout webviewContainer, TextView loadingText, ProgressBar progressBar, editTextManager searchbar, ConstraintLayout splashScreen, ImageView loading, MaxAdView banner_ads, ImageButton gateway_splash, LinearLayout top_bar, GeckoView gecko_view, ImageView backsplash, Button connect_button, View pFindBar, EditText pFindText, TextView pFindCount, androidx.constraintlayout.widget.ConstraintLayout pTopLayout, ImageButton pVoiceInput, ImageButton pMenu, androidx.core.widget.NestedScrollView pNestedScroll, ImageView pBlocker, ImageView pBlockerFullSceen, View mSearchEngineBar, TextView pCopyright, RecyclerView pHistListView, com.google.android.material.appbar.AppBarLayout pAppBar, ImageButton pOrbotLogManager, ConstraintLayout pInfoLandscape, ConstraintLayout pInfoPortrait, ProgressBar pProgressBarIndeterminate, FragmentContainerView pTabFragment, LinearLayout pTopBarContainer, ImageView pSearchLock, ImageView pTopBarHider, ImageView pNewTabBlocker, CoordinatorLayout mCoordinatorLayout, ImageView pImageDivider, ImageButton pPanicButton, ImageView pGenesisLogo, ImageButton pPanicButtonLandscape, ImageView pTorDisabled){ this.mContext = context; this.mProgressBar = progressBar; this.mSearchbar = searchbar; @@ -161,6 +162,7 @@ class homeViewController this.mGenesisLogo = pGenesisLogo; this.mPanicButtonLandscape = pPanicButtonLandscape; this.mLogHandler = new LogHandler(); + this.mTorDisabled = pTorDisabled; initSplashScreen(); createUpdateUiHandler(); @@ -225,7 +227,14 @@ class homeViewController } params1.setMargins(0, 0, 0,(helperMethod.pxFromDp(60)+mBannerHeight)*-1); mNestedScroll.setLayoutParams(params1); - + if(!status.sTorBrowsing){ + mTorDisabled.setAlpha(1); + mTorDisabled.setVisibility(View.VISIBLE); + mConnectButton.setVisibility(View.GONE); + mOrbotLogManager.setVisibility(View.GONE); + mGatewaySplash.setVisibility(View.GONE); + mCopyright.setVisibility(View.GONE); + } } @@ -492,7 +501,7 @@ class homeViewController public void initStatusBarColor(boolean mInstant) { int mDelay = 1000; - if(status.mThemeApplying || mInstant || status.sSettingIsAppStarted){ + if(!status.sTorBrowsing || status.mThemeApplying || mInstant || status.sSettingIsAppStarted){ mDelay = 0; } @@ -616,7 +625,7 @@ class homeViewController protected Void doInBackground(Void...arg0) { AppCompatActivity temp_context = mContext; int mCounter = 0; - while (orbotLocalConstants.mSOCKSPort==-1 && (!orbotLocalConstants.mIsTorInitialized || !orbotLocalConstants.mNetworkState)){ + while (status.sTorBrowsing && (orbotLocalConstants.mSOCKSPort==-1 || !orbotLocalConstants.mIsTorInitialized || !orbotLocalConstants.mNetworkState)){ try { boolean mFastConnect = status.sSettingIsAppStarted || !status.sRestoreTabs && status.sAppInstalled && status.sSettingDefaultSearchEngine.equals(constants.CONST_BACKEND_GENESIS_URL) && !status.sBridgeStatus && status.sExternalWebsite.equals(strings.GENERIC_EMPTY_STR); @@ -638,7 +647,7 @@ class homeViewController sleep(500); if(mCounter>20 && orbotLocalConstants.mSOCKSPort!=-1){ break; - }else { + }else if (orbotLocalConstants.mNetworkState && status.sBridgeStatus){ mCounter+=1; } if(mFastConnect){ @@ -853,8 +862,22 @@ class homeViewController ImageButton mRefresh = popupView.findViewById(R.id.menu21); ImageButton mDownload = popupView.findViewById(R.id.menuItem25); CheckBox desktop = popupView.findViewById(R.id.menu27); + CheckBox torBrowsing = popupView.findViewById(R.id.menu30); + LinearLayout newIdentity = popupView.findViewById(R.id.menu28); LinearLayout newTab = popupView.findViewById(R.id.menu11); + LinearLayout genesisLogs = popupView.findViewById(R.id.menu12); desktop.setChecked(userAgent==USER_AGENT_MODE_DESKTOP); + + if(status.sTorBrowsing){ + torBrowsing.setChecked(true); + newIdentity.setVisibility(View.VISIBLE); + genesisLogs.setVisibility(View.VISIBLE); + } + else { + torBrowsing.setChecked(false); + newIdentity.setVisibility(View.GONE); + genesisLogs.setVisibility(View.GONE); + } if(pIsBookmarked){ try { bookmark .setImageDrawable(helperMethod.getDrawableXML(mContext,R.xml.ic_baseline_bookmark_filled)); 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 c897193d..dc97f864 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 @@ -229,6 +229,7 @@ public class settingClearController extends AppCompatActivity { dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_INSTALLED,false)); dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.BRIDGE_ENABLES,false)); dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_GATEWAY_MANUAL,false)); + dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_TOR_BROWSING,true)); if(mIsThemeChangable) { status.mThemeApplying = true; 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 67e26f88..f339f54a 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 @@ -227,7 +227,7 @@ public class settingGeneralController extends AppCompatActivity { public void onSelectTheme(View view){ if(!mIsThemeChanging){ mIsThemeChanging = true; - if(view.getId() == R.id.pBridgeSettingOption1){ + if(view.getId() == R.id.pSearchSettingOption1){ if(status.sTheme != enums.Theme.THEME_DARK) { mSettingGeneralViewController.onTrigger(settingGeneralEnums.eGeneralViewController.M_RESET_THEME, null); mSettingGeneralViewController.onTrigger(settingGeneralEnums.eGeneralViewController.M_SET_THEME, Collections.singletonList(enums.Theme.THEME_DARK)); @@ -238,7 +238,7 @@ public class settingGeneralController extends AppCompatActivity { }else { mIsThemeChanging = false; } - }else if(view.getId() == R.id.pBridgeSettingOption2) { + }else if(view.getId() == R.id.pSearchSettingOption2) { if(status.sTheme != enums.Theme.THEME_LIGHT) { mSettingGeneralViewController.onTrigger(settingGeneralEnums.eGeneralViewController.M_RESET_THEME, null); mSettingGeneralViewController.onTrigger(settingGeneralEnums.eGeneralViewController.M_SET_THEME, Collections.singletonList(enums.Theme.THEME_LIGHT)); 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 53df1d72..d3c9715f 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 @@ -3,6 +3,7 @@ package com.hiddenservices.onionservices.appManager.settingManager.searchEngineM import android.content.res.Configuration; import android.os.Bundle; import android.view.View; +import android.widget.LinearLayout; import android.widget.RadioButton; import androidx.annotation.NonNull; @@ -34,6 +35,7 @@ public class settingSearchController extends AppCompatActivity { private SwitchMaterial mSearchSuggestions; private settingSearchModel mSettingSearchModel; private settingSearchViewController mSettingSearchViewController; + private LinearLayout mSearchSettingOption1 = null; @Override protected void onCreate(Bundle savedInstanceState) { @@ -63,9 +65,10 @@ public class settingSearchController extends AppCompatActivity { mSearchEngines.add(findViewById(R.id.mRadioSearch_5)); mSearchHistory = findViewById(R.id.pSearchHistory); mSearchSuggestions = findViewById(R.id.pSearchSuggestions); + mSearchSettingOption1 = findViewById(R.id.pSearchSettingOption1); activityContextManager.getInstance().onStack(this); - mSettingSearchViewController = new settingSearchViewController(this, new settingSearchViewCallback(), mSearchEngines, mSearchHistory, mSearchSuggestions); + mSettingSearchViewController = new settingSearchViewController(this, new settingSearchViewCallback(), mSearchEngines, mSearchHistory, mSearchSuggestions, mSearchSettingOption1); mSettingSearchModel = new settingSearchModel(new settingSearchModelCallback()); } @@ -127,23 +130,23 @@ public class settingSearchController extends AppCompatActivity { } public void onSelectSearchEngine(View view) { - if(view.getId() == R.id.pBridgeSettingOption1){ + if(view.getId() == R.id.pSearchSettingOption1){ mSettingSearchModel.onTrigger(settingSearchEnums.eSearchModel.M_SET_SEARCH_ENGINE, Collections.singletonList(constants.CONST_BACKEND_GENESIS_URL)); dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_STRING, Arrays.asList(keys.SETTING_SEARCH_ENGINE, status.sSettingDefaultSearchEngine)); } - else if(view.getId() == R.id.pBridgeSettingOption2){ + else if(view.getId() == R.id.pSearchSettingOption2){ mSettingSearchModel.onTrigger(settingSearchEnums.eSearchModel.M_SET_SEARCH_ENGINE, Collections.singletonList(constants.CONST_BACKEND_DUCK_DUCK_GO_URL)); dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_STRING, Arrays.asList(keys.SETTING_SEARCH_ENGINE, status.sSettingDefaultSearchEngine)); } - else if(view.getId() == R.id.pOption3){ + else if(view.getId() == R.id.pSearchSettingOption3){ mSettingSearchModel.onTrigger(settingSearchEnums.eSearchModel.M_SET_SEARCH_ENGINE, Collections.singletonList(constants.CONST_BACKEND_GOOGLE_URL)); dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_STRING, Arrays.asList(keys.SETTING_SEARCH_ENGINE, status.sSettingDefaultSearchEngine)); } - else if(view.getId() == R.id.pOption4){ + else if(view.getId() == R.id.pSearchSettingOption4){ mSettingSearchModel.onTrigger(settingSearchEnums.eSearchModel.M_SET_SEARCH_ENGINE, Collections.singletonList(constants.CONST_BACKEND_BING_URL)); dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_STRING, Arrays.asList(keys.SETTING_SEARCH_ENGINE, status.sSettingDefaultSearchEngine)); } - else if(view.getId() == R.id.pOption5){ + else if(view.getId() == R.id.pSearchSettingOption5){ mSettingSearchModel.onTrigger(settingSearchEnums.eSearchModel.M_SET_SEARCH_ENGINE, Collections.singletonList(constants.CONST_BACKEND_WIKI_URL)); dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_STRING, Arrays.asList(keys.SETTING_SEARCH_ENGINE, status.sSettingDefaultSearchEngine)); } 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 0f3e0fa8..e384f0bc 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 @@ -5,6 +5,7 @@ import android.os.Build; import android.view.View; import android.view.Window; import android.view.WindowManager; +import android.widget.LinearLayout; import android.widget.RadioButton; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatDelegate; @@ -26,16 +27,18 @@ class settingSearchViewController private ArrayList mSearchEngines; private SwitchMaterial mSearchHistory; private SwitchMaterial mSearchSuggestions; + private LinearLayout mSearchSettingOption1 = null; /*Initializations*/ - settingSearchViewController(settingSearchController pContext, eventObserver.eventListener pEvent, ArrayList pSearchEngines, SwitchMaterial pSearchHistory, SwitchMaterial pSearchSuggestions) + settingSearchViewController(settingSearchController pContext, eventObserver.eventListener pEvent, ArrayList pSearchEngines, SwitchMaterial pSearchHistory, SwitchMaterial pSearchSuggestions, LinearLayout pSearchSettingOption1) { this.mEvent = pEvent; this.mContext = pContext; this.mSearchEngines = pSearchEngines; this.mSearchHistory = pSearchHistory; this.mSearchSuggestions = pSearchSuggestions; + this.mSearchSettingOption1 = pSearchSettingOption1; initViews(); initPostUI(); @@ -48,21 +51,24 @@ class settingSearchViewController } private void initPostUI(){ - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - Window window = mContext.getWindow(); - window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); + Window window = mContext.getWindow(); + window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); - if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) { - window.setStatusBarColor(mContext.getResources().getColor(R.color.blue_dark)); - mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.landing_ease_blue)); - } - else { - if(AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_NO){ - mContext.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - } - mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.c_background)); - } + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) { + window.setStatusBarColor(mContext.getResources().getColor(R.color.blue_dark)); + mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.landing_ease_blue)); } + else { + if(AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_NO){ + mContext.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + } + mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.c_background)); + } + + if(!status.sTorBrowsing){ + mSearchSettingOption1.setVisibility(View.GONE); + } + } private void initSearchViews(){ diff --git a/app/src/main/java/com/hiddenservices/onionservices/constants/keys.java b/app/src/main/java/com/hiddenservices/onionservices/constants/keys.java index f58b10f3..6f6ebba4 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/constants/keys.java +++ b/app/src/main/java/com/hiddenservices/onionservices/constants/keys.java @@ -6,6 +6,7 @@ public class keys public static final String M_ACTIVITY_RESPONSE = "M_ACTIVITY_RESPONSE"; public static final String M_ACTIVITY_NAVIGATION_BUNDLE_KEY = "M_ACTIVITY_NAVIGATION_BUNDLE_KEY"; + public static final String M_RESTART_APP_KEY = "M_RESTART_APP_KEY"; /*Home Manager*/ @@ -22,13 +23,8 @@ public class keys public static final String PROXY_SOCKS_PORT = "network.proxy.socks_port"; public static final String PROXY_SOCKS_VERSION = "network.proxy.socks_version"; public static final String PROXY_SOCKS_REMOTE_DNS = "network.proxy.socks_remote_dns"; - public static final String PROXY_CACHE = "browser.cache.disk.enable"; - public static final String PROXY_MEMORY = "browser.cache.memory.enable"; - public static final String PROXY_DO_NOT_TRACK_HEADER_ENABLED = "privacy.donottrackheader.enabled"; - public static final String PROXY_DO_NOT_TRACK_HEADER_VALUE = "privacy.donottrackheader.value"; public static final String PROXY_IS_APP_RATED = "IS_APP_RATED"; public static final String PROXY_LIST_TYPE = "list_type"; - public static final String PROXY_IMAGE = "permissions.default.image"; /*Settings*/ @@ -41,6 +37,7 @@ public class keys public static final String SETTING_POPUP = "POPUP_V1"; public static final String SETTING_HISTORY_CLEAR = "HISTORY_CLEAR_V1"; public static final String SETTING_GATEWAY = "pref_bridges_enabled_auto_V1"; + public static final String SETTING_TOR_BROWSING = "pref_tor_browsing_V1"; public static final String SETTING_GATEWAY_MANUAL = "pref_bridges_enabled_manual_V1"; public static final String SETTING_IS_BOOTSTRAPPED = "IS_BOOTSTRAPPED_V1"; public static final String SETTING_IS_WELCOME_ENABLED = "IS_WELCOME_ENABLED_V1"; 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 755020b9..22cb5615 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/constants/status.java +++ b/app/src/main/java/com/hiddenservices/onionservices/constants/status.java @@ -34,6 +34,7 @@ public class status public static String sExternalWebsite = strings.GENERIC_EMPTY_STR; public static String sBridgesDefault = strings.BRIDGES_DEFAULT; + public static boolean sTorBrowsing = false; public static boolean sExternalWebsiteLoading = false; public static boolean sUIInteracted = false; public static boolean sSettingEnableZoom = true; @@ -136,10 +137,14 @@ public class status status.sTabGridLayoutEnabled = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.SETTING_SHOW_TAB_GRID,true)); status.sGlobalURLCount = (int)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_INT, Arrays.asList(keys.SETTING_RATE_COUNT, 0)); status.sAppInstalled = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.SETTING_INSTALLED,false)); + status.sTorBrowsing = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.SETTING_TOR_BROWSING,true)); if(status.sGlobalURLCount <=10 && status.sGlobalURLCount>=8){ status.sGlobalURLCount = 6; } + if(!status.sTorBrowsing && status.sSettingDefaultSearchEngine.equals(constants.CONST_BACKEND_GENESIS_URL)){ + status.sSettingDefaultSearchEngine = constants.CONST_BACKEND_DUCK_DUCK_GO_URL; + } } } diff --git a/app/src/main/java/com/hiddenservices/onionservices/dataManager/dataController.java b/app/src/main/java/com/hiddenservices/onionservices/dataManager/dataController.java index 412afd95..17cd6042 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/dataManager/dataController.java +++ b/app/src/main/java/com/hiddenservices/onionservices/dataManager/dataController.java @@ -251,6 +251,7 @@ public class dataController dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_POPUP,true)); dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_STRING, Arrays.asList(keys.BRIDGE_CUSTOM_TYPE,strings.BRIDGE_CUSTOM_BRIDGE_OBFS4)); dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_INSTALLED,false)); + dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_TOR_BROWSING,true)); invokeSQLCipher(dataEnums.eSqlCipherCommands.M_INIT, Collections.singletonList(mContext)); invokeSQLCipher(dataEnums.eSqlCipherCommands.M_EXEC_SQL, Arrays.asList(SQL_CLEAR_HISTORY,null)); 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 4e6e8033..5edca779 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/helperManager/helperMethod.java +++ b/app/src/main/java/com/hiddenservices/onionservices/helperManager/helperMethod.java @@ -10,6 +10,7 @@ import android.app.PendingIntent; import android.content.ActivityNotFoundException; import android.content.ClipData; import android.content.ClipboardManager; +import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; @@ -32,6 +33,7 @@ import android.os.Vibrator; import android.text.SpannableString; import android.text.Spanned; import android.text.style.ForegroundColorSpan; +import android.util.Log; import android.view.Display; import android.view.Gravity; import android.view.LayoutInflater; @@ -53,6 +55,8 @@ import androidx.core.content.ContextCompat; import androidx.core.content.FileProvider; import androidx.core.graphics.ColorUtils; +import com.example.myapplication.BuildConfig; +import com.hiddenservices.onionservices.appManager.activityContextManager; import com.hiddenservices.onionservices.appManager.homeManager.geckoManager.geckoSession; import com.hiddenservices.onionservices.appManager.kotlinHelperLibraries.defaultBrowser; import com.hiddenservices.onionservices.constants.constants; @@ -108,6 +112,7 @@ import static com.hiddenservices.onionservices.constants.constants.CONST_LIST_EX import static com.hiddenservices.onionservices.constants.constants.CONST_PACKAGE_NAME; import static com.hiddenservices.onionservices.constants.constants.CONST_PLAYSTORE_URL; import static com.hiddenservices.onionservices.constants.keys.M_ACTIVITY_NAVIGATION_BUNDLE_KEY; +import static com.hiddenservices.onionservices.constants.keys.M_RESTART_APP_KEY; import static com.hiddenservices.onionservices.pluginManager.pluginEnums.eMessageManager.M_OPEN_ACTIVITY_FAILED; public class helperMethod @@ -306,7 +311,7 @@ public class helperMethod } public static String completeURL(String pURL){ - if(pURL.equals("about:blank") || pURL.equals("about:config")){ + if(pURL.equals("about:blank") || pURL.equals("about:config") || pURL.startsWith("resource://")){ return pURL; } URL weburl; @@ -1071,4 +1076,32 @@ public class helperMethod return popupWindow; } + 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() { + super.run(); + + PackageManager packageManager = activityContextManager.getInstance().getHomeController().getPackageManager(); + Intent intent = packageManager.getLaunchIntentForPackage(activityContextManager.getInstance().getHomeController().getPackageName()); + ComponentName componentName = intent.getComponent(); + Intent mainIntent = Intent.makeRestartActivityTask(componentName); + mainIntent.putExtra(M_RESTART_APP_KEY, pOpenOnRestart); + activityContextManager.getInstance().getHomeController().getApplicationContext().startActivity(mainIntent); + } + }); + Runtime.getRuntime().exit(0); + } + } diff --git a/app/src/main/java/com/hiddenservices/onionservices/pluginManager/downloadPluginManager/downloadReciever.java b/app/src/main/java/com/hiddenservices/onionservices/pluginManager/downloadPluginManager/downloadReciever.java index acb76e8c..058e1100 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/pluginManager/downloadPluginManager/downloadReciever.java +++ b/app/src/main/java/com/hiddenservices/onionservices/pluginManager/downloadPluginManager/downloadReciever.java @@ -92,6 +92,7 @@ public class downloadReciever extends AsyncTask { mNotifyManager = (NotificationManager) mContext.get().getSystemService(Context.NOTIFICATION_SERVICE); mNotificationBuilder = new NotificationCompat.Builder(mContext.get()); + mNotificationBuilder = new NotificationCompat.Builder(mContext.get()); mNotificationBuilder.setContentTitle(mFileName) .setContentText("starting...") .setChannelId(mNotificationID + "") @@ -134,12 +135,21 @@ public class downloadReciever extends AsyncTask { HttpURLConnection conection; Proxy proxy; if(helperMethod.getDomainName(fURL).contains(".onion")){ - proxy = new Proxy(Proxy.Type.SOCKS, InetSocketAddress.createUnresolved("localhost", orbotLocalConstants.mSOCKSPort)); - conection = (HttpURLConnection) url.openConnection(proxy); + if(orbotLocalConstants.mSOCKSPort==-1){ + proxy = new Proxy(Proxy.Type.SOCKS, InetSocketAddress.createUnresolved("localhost", orbotLocalConstants.mSOCKSPort)); + conection = (HttpURLConnection) url.openConnection(proxy); + }else { + conection = (HttpURLConnection) url.openConnection(); + } }else { - Proxy mProxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", orbotLocalConstants.mHTTPPort)); - URLConnection mURLConnection = new URI(fURL).toURL().openConnection(mProxy); - conection = (HttpURLConnection) mURLConnection; + if(orbotLocalConstants.mSOCKSPort==-1){ + Proxy mProxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", orbotLocalConstants.mHTTPPort)); + URLConnection mURLConnection = new URI(fURL).toURL().openConnection(mProxy); + conection = (HttpURLConnection) mURLConnection; + }else{ + URLConnection mURLConnection = new URI(fURL).toURL().openConnection(); + conection = (HttpURLConnection) mURLConnection; + } } conection.setRequestProperty("User-Agent","Mozilla/5.0 (Windows NT 6.1; rv:60.0) Gecko/20100101 Firefox/60.0"); @@ -156,10 +166,12 @@ public class downloadReciever extends AsyncTask { String urlEncoded = Uri.encode(f_url[0], ALLOWED_URI_CHARS); StrongHttpsClient httpclient = new StrongHttpsClient(mContext.get()); - if(helperMethod.getDomainName(f_url[0]).contains(".onion")){ - httpclient.useProxy(true, "SOCKS", "127.0.0.1", orbotLocalConstants.mSOCKSPort); - }else { - httpclient.useProxy(true, "SOCKS", "127.0.0.1", orbotLocalConstants.mSOCKSPort); + if(orbotLocalConstants.mSOCKSPort!=-1){ + if(helperMethod.getDomainName(f_url[0]).contains(".onion")){ + httpclient.useProxy(true, "SOCKS", "127.0.0.1", orbotLocalConstants.mSOCKSPort); + }else { + httpclient.useProxy(true, "SOCKS", "127.0.0.1", orbotLocalConstants.mSOCKSPort); + } } HttpGet httpget = new HttpGet(urlEncoded); diff --git a/app/src/main/java/com/hiddenservices/onionservices/pluginManager/orbotPluginManager/orbotManager.java b/app/src/main/java/com/hiddenservices/onionservices/pluginManager/orbotPluginManager/orbotManager.java index 67bf9aae..17a2ac94 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/pluginManager/orbotPluginManager/orbotManager.java +++ b/app/src/main/java/com/hiddenservices/onionservices/pluginManager/orbotPluginManager/orbotManager.java @@ -11,6 +11,7 @@ import java.util.Collections; import java.util.List; import com.hiddenservices.onionservices.constants.constants; import com.hiddenservices.onionservices.constants.keys; +import com.hiddenservices.onionservices.constants.status; import com.hiddenservices.onionservices.eventObserver; import com.hiddenservices.onionservices.helperManager.helperMethod; import com.hiddenservices.onionservices.pluginManager.pluginEnums; @@ -60,22 +61,25 @@ public class orbotManager } private void onInitailizeService(){ + if(status.sTorBrowsing){ + Intent startTorIntent = new Intent(mAppContext.get(), OrbotService.class); + startTorIntent.setAction(ACTION_START); + if (mAppContext.get().getPackageName() != null) { + startTorIntent.putExtra(OrbotService.EXTRA_PACKAGE_NAME, mAppContext.get().getPackageName()); + } + mAppContext.get().startService(startTorIntent); - Intent startTorIntent = new Intent(mAppContext.get(), OrbotService.class); - startTorIntent.setAction(ACTION_START); - if (mAppContext.get().getPackageName() != null) { - startTorIntent.putExtra(OrbotService.EXTRA_PACKAGE_NAME, mAppContext.get().getPackageName()); + SharedPreferences settings = mAppContext.get().getSharedPreferences("se", MODE_PRIVATE); + SharedPreferences.Editor editor = settings.edit(); + editor.putInt(keys.PROXY_TYPE, 1); + editor.putString(keys.PROXY_SOCKS, constants.CONST_PROXY_SOCKS); + editor.putInt(keys.PROXY_SOCKS_PORT, orbotLocalConstants.mSOCKSPort); + editor.putInt(keys.PROXY_SOCKS_VERSION,constants.CONST_PROXY_SOCKS_VERSION); + editor.putBoolean(keys.PROXY_SOCKS_REMOTE_DNS,constants.CONST_PROXY_SOCKS_REMOTE_DNS); + editor.apply(); + }else { + orbotLocalConstants.mIsTorInitialized = true; } - mAppContext.get().startService(startTorIntent); - - SharedPreferences settings = mAppContext.get().getSharedPreferences("se", MODE_PRIVATE); - SharedPreferences.Editor editor = settings.edit(); - editor.putInt(keys.PROXY_TYPE, 1); - editor.putString(keys.PROXY_SOCKS, constants.CONST_PROXY_SOCKS); - editor.putInt(keys.PROXY_SOCKS_PORT, orbotLocalConstants.mSOCKSPort); - editor.putInt(keys.PROXY_SOCKS_VERSION,constants.CONST_PROXY_SOCKS_VERSION); - editor.putBoolean(keys.PROXY_SOCKS_REMOTE_DNS,constants.CONST_PROXY_SOCKS_REMOTE_DNS); - editor.apply(); } 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 0326ee6f..d8bb24f7 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/pluginManager/pluginController.java +++ b/app/src/main/java/com/hiddenservices/onionservices/pluginManager/pluginController.java @@ -1,17 +1,9 @@ package com.hiddenservices.onionservices.pluginManager; -import android.annotation.SuppressLint; -import android.app.AlarmManager; -import android.app.PendingIntent; -import android.content.Context; -import android.content.Intent; -import android.content.pm.PackageManager; -import android.os.Handler; import android.view.WindowManager; import android.widget.ImageView; import androidx.appcompat.app.AppCompatActivity; -import com.example.myapplication.R; import com.hiddenservices.onionservices.appManager.activityContextManager; import com.hiddenservices.onionservices.appManager.homeManager.geckoManager.geckoSession; import com.hiddenservices.onionservices.appManager.homeManager.homeController.homeController; @@ -350,7 +342,8 @@ public class pluginController mHomeController.get().runOnUiThread(() -> mHomeController.get().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)); } else if(pEventType.equals(M_IMAGE_UPDATE_RESTART)){ - ((homeController)mHomeController.get()).onRestartApp(); + onOrbotInvoke(Collections.singletonList(status.mThemeApplying), pluginEnums.eOrbotManager.M_DESTROY); + helperMethod.restartAndOpen(false); } return null; } diff --git a/app/src/main/res/drawable-hdpi/tor_logo.png b/app/src/main/res/drawable-hdpi/tor_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..5d23c5f6749f44c1ee6798b0d2e2f10a33bb8389 GIT binary patch literal 52780 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 B?nD3p literal 0 HcmV?d00001 diff --git a/app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml b/app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml index 4e573c5c..0969042a 100644 --- a/app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml +++ b/app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml @@ -171,7 +171,7 @@ android:background="@color/c_white"/> + + + android:src="@drawable/tor_logo"/> + + + + + + + + + + + + + أفتح الإعدادات - طلب جديد Bridge - REQUEST Bridge + طلب جديد Bridge حدد البريد الإلكتروني أدناه لطلب عنوان Bridge بمجرد أن يكون لديك عنوان ، انسخه والصقه في المربع أعلاه وابدأ التطبيق. البريد @@ -391,6 +390,7 @@ تصفح روابط الويب اعدادات النظام موقع سطح المكتب + Tor اتصال احفظ هذه الصفحة إشارات مرجعية تقرير الموقع diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 94c06601..7dc14567 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -94,9 +94,8 @@ obre la configuració - Sol·licita Un Nou Bridge - REQUEST Bridge - Seleccioneu el correu electrònic següent per sol·licitar una adreça Bridge. Un cop tingueu una adreça, copieu-la i enganxeu-la al quadre anterior i inicieu l\'aplicació. + Sol·licita Un Nou Bridge +\ Seleccioneu el correu electrònic següent per sol·licitar una adreça Bridge. Un cop tingueu una adreça, copieu-la i enganxeu-la al quadre anterior i inicieu l\'aplicació. Correu @@ -322,7 +321,6 @@ elimineu la personalització del navegador - Bridge ... lloc web de marcadors suprimiu els enllaços web i les dades navegats neteja el marcador i les dades @@ -385,6 +383,7 @@ enllaços web navegats Configuració del sistema lloc d\'escriptori + Tor Connexió deseu aquesta pàgina marcadors lloc web d\'informes diff --git a/app/src/main/res/values-ch/strings.xml b/app/src/main/res/values-ch/strings.xml index fb29f35f..9292bbe7 100644 --- a/app/src/main/res/values-ch/strings.xml +++ b/app/src/main/res/values-ch/strings.xml @@ -107,8 +107,7 @@ otevřete nastavení - Vyžádat Nový Bridge - REQUEST Bridge + Vyžádat Nový Bridge Níže vyberte E-mail a požádejte o adresu Bridge. Jakmile adresu zadáte, zkopírujte ji a vložte do výše uvedeného pole a spusťte aplikaci. Pošta @@ -396,6 +395,7 @@ procházené webové odkazy Systémové nastavení web pro počítače + Tor Spojení uložit tuto stránku záložky nahlásit web diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 403a7099..900ed618 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -108,8 +108,7 @@ Einstellungen öffnen - Anfrage Neu Bridge - REQUEST Bridge + Anfrage Neu Bridge Wählen Sie unten E-Mail aus, um eine Bridge-Adresse anzufordern. Sobald Sie eine Adresse haben, kopieren Sie sie und fügen Sie sie in das obige Feld ein und starten Sie die Anwendung. E-Mail @@ -398,6 +397,7 @@ durchsuchte Weblinks Systemeinstellung Desktop-Site + Tor Verbindung Speichern Sie diese Seite Lesezeichen report website diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index f34339d6..4500abc1 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -159,8 +159,7 @@ Λήψη αρχείου εικόνας - Αίτημα Νέο Bridge - REQUEST Bridge + Αίτημα Νέο Bridge Επιλέξτε E-mail παρακάτω για να ζητήσετε μια διεύθυνση Bridge. Μόλις έχετε μια διεύθυνση, αντιγράψτε και επικολλήστε την στο παραπάνω πλαίσιο και ξεκινήστε την εφαρμογή. Αλληλογραφία @@ -388,6 +387,7 @@ περιηγημένοι σύνδεσμοι ιστού Ρυθμίσεις συστήματος επιτραπέζιος ιστότοπος + Tor Σύνδεση αποθηκεύστε αυτήν τη σελίδα σελιδοδείκτες αναφέρετε τον ιστότοπο diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ec7fae98..9cb74d80 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -84,10 +84,9 @@ Meek-azur (Chine) - demander nouveau Bridge + demander nouveau Bridge sélectionnez mail pour demander une adresse bridge. une fois que vous l\'avez reçu, copiez-le et collez-le dans la case ci-dessus et démarrez le logiciel. mail - REQUEST Bridge changer la façon dont le journal système apparaît @@ -404,6 +403,7 @@ liens Web parcourus Paramètres système desktop site + Tor Lien enregistrer cette page signets rapport site Web diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index de32f573..066579b6 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -108,8 +108,7 @@ nyisd meg a beállításokat - Új Kérés Bridge - REQUEST Bridge + Új Kérés Bridge Válassza ki az alábbi e-mailt az Bridge-es cím kéréséhez. Ha megvan a címe, másolja ki és illessze be a fenti mezőbe, és indítsa el az alkalmazást. Mail @@ -338,8 +337,6 @@ távolítsa el a böngésző testreszabását - Bridge ... - könyvjelző weboldal törölje a böngészett weblinkeket és az adatokat törölje a könyvjelzőt és az adatokat @@ -390,6 +387,7 @@ böngészett weblinkek Rendszerbeállítás asztali webhely + Tor Kapcsolat mentsd el ezt az oldalt könyvjelzők jelentés honlapja diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml index 875a5739..64f8d256 100644 --- a/app/src/main/res/values-in-rID/strings.xml +++ b/app/src/main/res/values-in-rID/strings.xml @@ -80,7 +80,7 @@ Meek-biru (Cina) - aanvragen selecteer mail om een ​​bridge-adres aan te vragen. Zodra u het heeft ontvangen, kopieert en plakt u het in het bovenstaande vak en start u de software.​taal niet ondersteund + REQUEST BRIDGE systeemtaal wordt niet ondersteund door deze software. we werken eraan om het binnenkort op te nemen mail @@ -108,9 +108,6 @@ Identitas baru dibuat buka pengaturan - - REQUEST Bridge - MAAF MENDENGARNYA Jika Anda mengalami kesulitan saat menggunakan aplikasi ini, silakan hubungi kami melalui email. Kami akan mencoba menyelesaikan masalah Anda sesegera mungkin @@ -386,7 +383,8 @@ downloads bladwijzers Sla Deze Pagina Op - desktop site + desktop Verbinding + Tor Connection rapport website beoordeel deze app vind op pagina diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 411eaa1f..5b1ae5eb 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -108,8 +108,7 @@ apri impostazioni - Richiedi Nuovo Bridge - REQUEST Bridge + Richiedi Nuovo Bridge Seleziona E-mail qui sotto per richiedere un indirizzo Bridge. Una volta che hai un indirizzo, copialo e incollalo nella casella sopra e avvia l\'applicazione. Posta @@ -355,8 +354,6 @@ rimuovere la personalizzazione del browser - Bridge ... - sito web di segnalibro eliminare i collegamenti Web ei dati esplorati segnalibro chiaro e dati @@ -408,6 +405,7 @@ collegamenti Web visitati Impostazioni di sistema sito desktop + Tor Connessione salva questa pagina segnalibri sito web di report diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 53ac37ab..8477df87 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -338,8 +338,6 @@ ブラウザのカスタマイズを削除する - Bridge ... - ブックマークのウェブサイト 閲覧したウェブリンクとデータを削除する ブックマークとデータをクリアする @@ -391,6 +389,7 @@ 閲覧したWebリンク システム設定 デスクトップサイト + Tor 繋がり このページを保存する ブックマーク レポートのウェブサイト diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index a5f7f937..00e8015b 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -108,8 +108,7 @@ 설정 열기 - 새로운 요청 Bridge - REQUEST Bridge + 새로운 요청 Bridge Bridge 주소를 요청하려면 아래 이메일을 선택하십시오. 주소가 있으면 복사하여 위의 상자에 붙여넣고 응용 프로그램을 시작하십시오. 메일 @@ -343,8 +342,6 @@ 브라우저 사용자 정의 제거 - Bridge ... - 북마크 웹 사이트 탐색 한 웹 링크 및 데이터 삭제 책갈피 및 데이터 지우기 @@ -396,6 +393,7 @@ 탐색 한 웹 링크 시스템 설정 데스크탑 사이트 + Tor 연결 이 페이지 저장 북마크 웹 사이트 신고 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 4f3c2d51..30fc1902 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -104,8 +104,7 @@ open instellingen - Nieuw Bridge Aanvragen - REQUEST Bridge + Nieuw Bridge Aanvragen Selecteer E-mail hieronder om een ​​Bridge-adres aan te vragen. Zodra u een adres heeft, kopieert en plakt u het in het bovenstaande vak en start u de aanvraag. Mail @@ -335,8 +334,6 @@ Browserinstellingen wissen - brug snaar ... - Bookmark Website Geschiedenis en gegevens wissen Bladwijzer en gegevens wissen @@ -386,6 +383,7 @@ Geschiedenis Instellingen Desktopsite + Tor Verbinding Maak Een Bladwijzer Voor Deze Pagina Bladwijzers Rapport website diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index bdd81395..8a9d6315 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -108,8 +108,7 @@ abrir configurações - Solicitar Novo Bridge - REQUEST Bridge + Solicitar Novo Bridge Selecione E-mail abaixo para solicitar um endereço Bridge.Uma vez que você tenha um endereço, copie e cole na caixa acima e inicie o aplicativo. Mail @@ -347,8 +346,6 @@ remover personalização do navegador - Bridge ... - site de favoritos excluir links da web navegados e dados limpar favorito e dados @@ -399,6 +396,7 @@ links da web navegados Configuração de sistema desktop site + Tor Conexão salve esta página favoritos site do relatório diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 7fa49aee..aadaeefa 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -108,8 +108,7 @@ deschide setările - Cerere Nouă Bridge - REQUEST Bridge + Cerere Nouă Bridge Selectați E-mailul de mai jos pentru a solicita o adresă Bridge. După ce aveți o adresă, copiați-o și lipiți-o în caseta de mai sus și porniți aplicația. Mail @@ -341,8 +340,6 @@ eliminați personalizarea browserului - Bridge ... - site de marcaje ștergeți linkurile web și datele navigate marcaj clar și date @@ -394,6 +391,7 @@ legături web navigate Setarea sistemului desktop site + Tor Conexiune salvați această pagină marcaje raportați site-ul web diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index fa6c8560..93bb6419 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -108,8 +108,7 @@ открыть настройки - Запросить новый Bridge - REQUEST Bridge + Запросить новый Bridge Выберите адрес электронной почты ниже, чтобы запросить адрес Bridge. Как только у вас есть адрес, скопируйте и вставьте его в поле выше и запустите приложение. Почта @@ -336,8 +335,6 @@ удалить настройки браузера - Bridge ... - сайт закладок удалить просмотренные веб-ссылки и данные очистить закладку и данные @@ -386,6 +383,7 @@ просмотренные веб-ссылки Системные настройки настольный сайт + Tor Связь сохранить эту страницу закладки веб-сайт отчета diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 2bd7dc74..4f2a0273 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -108,8 +108,7 @@ เปิดการตั้งค่า - ขอใหม่ Bridge - REQUEST Bridge + ขอใหม่ Bridge เลือกอีเมลด้านล่างเพื่อขอที่อยู่ Bridge เมื่อคุณมีที่อยู่แล้ว ให้คัดลอกและวางลงในช่องด้านบนแล้วเริ่มแอปพลิเคชัน จดหมาย @@ -346,8 +345,6 @@ ลบการปรับแต่งเบราว์เซอร์ - Bridge ... - เว็บไซต์บุ๊คมาร์ค ลบเว็บลิงค์และข้อมูลที่เรียกดู ล้างบุ๊คมาร์คและข้อมูล @@ -399,6 +396,7 @@ ลิงก์เว็บที่เรียกดู การตั้งค่าระบบ ไซต์เดสก์ท็อป + Tor การเชื่อมต่อ บันทึกหน้านี้ บุ๊คมาร์ค รายงานเว็บไซต์ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index f71e98b5..bdf20ca6 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -159,8 +159,7 @@ Resim dosyasını indirin - Yeni Bridge Talebi - REQUEST Bridge + Yeni Bridge Talebi Bridge adresi istemek için aşağıdaki E-posta\'yı seçin. Bir adresiniz olduğunda, kopyalayıp yukarıdaki kutuya yapıştırın ve uygulamayı başlatın. Posta @@ -391,6 +390,7 @@ taranan web bağlantıları Sistem ayarı masaüstü sitesi + Tor Bağ bu sayfayı kaydet yer imleri web sitesini bildir diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index e2ab5334..784976a0 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -104,8 +104,7 @@ відкрити налаштування - Запит нового Bridge - REQUEST Bridge + Запит нового Bridge Виберіть E-mail нижче, щоб надіслати запит на адресу Bridge. Після того, як у вас є адреса, скопіюйте та вставте її у вікно вище та запустіть програму. Пошта @@ -338,8 +337,6 @@ Очистити налаштування браузера - мостова струна ... - Закладка Веб-сайт Очистити історію та дані Очистити закладки та дані @@ -387,6 +384,7 @@ Історія Налаштування Сайт для робочого столу + Tor Підключення Додати цю сторінку в закладки Закладки Веб-сайт звітів diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index ed0c661c..97fb207d 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -399,6 +399,7 @@ براؤز ویب لنکس سسٹم سیٹنگ ڈیسک ٹاپ سائٹ + Tor کنکشن اس صفحے کو محفوظ کریں بُک مارکس رپورٹ ویب سائٹ diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 96323351..0bea2cd1 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -108,8 +108,7 @@ mở cài đặt - Yêu Cầu Mới Bridge - REQUEST Bridge + Yêu Cầu Mới Bridge Chọn E-mail bên dưới để yêu cầu địa chỉ Bridge. Sau khi bạn có địa chỉ, hãy sao chép và dán nó vào ô trên và khởi động ứng dụng. Thư tín @@ -390,6 +389,7 @@ liên kết web đã duyệt Thiết lập hệ thống trang máy tính để bàn + Tor Sự liên quan lưu trang này dấu trang báo cáo trang web diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 178d0e8c..bf5a9b40 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -108,8 +108,7 @@ 打开设置 - 请求新的 Bridge - REQUEST Bridge + 请求新的 Bridge 选择下面的电子邮件以请求 Bridge 地址。获得地址后，将其复制并粘贴到上面的框中并启动应用程序。 邮件 @@ -341,8 +340,6 @@ 删除浏览器自定义 - Bridge ... - 书签网站 删除浏览的网页链接和数据 清除书签和数据 @@ -394,6 +391,7 @@ 浏览的网页链接 系统设定 桌面网站 + Tor 联系 保存此页面 书签 报告网站 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9bd37e4a..1fc3fa47 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -279,15 +279,15 @@ Stop all known trackers, Pages will load faster but some functionality might not work Allow Javascript | Toggle to Enable Javascript Disable java scripting for various script attacks - Block Popup | Toggle to Disable Popup Advert - Remove popup advertizement. Might break functionaly of some websites + Block Popup | Toggle to Disable Popup Advert + Remove popup advertizement. Might break functionaly of some websites Settings | Advance Restore tabs Don\'t restore after quitting browser Toolbar Theme Set toolbar theme as defined in website - Tab view - Switch between Tab manager Grid Layout and List Layout + Tab view + Switch between Tab manager Grid Layout and List Layout Show Images Always load website images Show web fonts @@ -300,8 +300,8 @@ Media Change default data saver settings Change default media settings - Grid Design - List Design + Grid Design + List Design Always show images Only show images over WI-FI Block all images @@ -326,8 +326,6 @@ Home, language Full-screen browsing Hide the browser toolbar when scrolling down a page - Searchbar theme - Automatically change search bar theme according to website Language Change the language of your browser Theme @@ -337,7 +335,7 @@ Change full-screen browsing and language settings System Default Home - about:blank + about:blank New Tab Open homepage in new tab Clear all tabs @@ -357,7 +355,7 @@ Clearing data will remove history, cookies, and other browsing data Remove all bookmarks ? Clear - Confirm + Confirm Report Report Website If you think this URL is illegal or disturbing, report it to us, so we can take legal action @@ -387,12 +385,12 @@ No application found to handle email Download File | Data Cleared | Restart Required - Data Cleared Successfully - Private data cleared successfully. Application will close in a moment. Now you can safely continue browsing - Closing Genesis Please Wait ... - Genesis Connecting ... - Application closed unexpectedly - Request New Bridge   Application crashed due to unexpected error. We are looking into the issue mean while you can continue with this application + Data Cleared Successfully + Private data cleared successfully. Application will close in a moment. Now you can safely continue browsing + Closing Genesis Please Wait ... + Genesis Connecting ... + Application closed unexpectedly + Request New Bridge   Application crashed due to unexpected error. We are looking into the issue mean while you can continue with this application New identity @@ -404,8 +402,9 @@ Downloads History Settings - New identity created + New identity created Desktop site + Tor Connection Bookmark This Page Bookmarks Recent tabs @@ -433,14 +432,14 @@ History Clear - Pages that you visit appear here + Pages that you visit appear here Search ... Bookmark Clear Search ... - Pages that you bookmark appear here + Pages that you bookmark appear here Retry diff --git a/orbotmanager/src/main/java/org/torproject/android/service/OrbotService.java b/orbotmanager/src/main/java/org/torproject/android/service/OrbotService.java index dfe852f0..1595bd31 100644 --- a/orbotmanager/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotmanager/src/main/java/org/torproject/android/service/OrbotService.java @@ -6,6 +6,8 @@ package org.torproject.android.service; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static org.torproject.android.service.TorServiceConstants.CMD_SETTING; import static org.torproject.android.service.TorServiceConstants.CMD_NEWNYM; +import static java.lang.Thread.sleep; + import android.annotation.SuppressLint; import android.app.Application; import android.app.Notification; @@ -106,7 +108,7 @@ public class OrbotService extends VpnService implements OrbotConstants { Handler mHandler; final Random bridgeSelectRandom = new Random(System.nanoTime()); - ActionBroadcastReceiver mActionBroadcastReceiver; + ActionBroadcastReceiver mActionBroadcastReceiver = null; private String mCurrentStatus = STATUS_OFF; TorControlConnection conn = null; private ServiceConnection torServiceConnection; @@ -148,8 +150,8 @@ public class OrbotService extends VpnService implements OrbotConstants { } private void showConnectedToTorNetworkNotification() { - mNotifyBuilder.setProgress(0, 0, false); - showToolbarNotification(getString(R.string.status_activated), NOTIFY_ID, R.mipmap.ic_stat_tor_logo); + // mNotifyBuilder.setProgress(0, 0, false); + // showToolbarNotification(getString(R.string.status_activated), NOTIFY_ID, R.mipmap.ic_stat_tor_logo); } @Override @@ -209,15 +211,15 @@ public class OrbotService extends VpnService implements OrbotConstants { mNotifyBuilder.mActions.clear(); if (conn != null && orbotLocalConstants.mIsTorInitialized) { - Intent intentRefresh = new Intent(CMD_NEWNYM); - PendingIntent pendingIntentNewNym = PendingIntent.getBroadcast(this, 0, intentRefresh, PendingIntent.FLAG_IMMUTABLE); - mNotifyBuilder.addAction(R.mipmap.ic_stat_tor_logo, getString(R.string.menu_new_identity), pendingIntentNewNym); - Intent intentSetting = new Intent(CMD_SETTING); - PendingIntent pendingIntentSetting = PendingIntent.getBroadcast(this, 0, intentSetting, PendingIntent.FLAG_IMMUTABLE); - mNotifyBuilder.addAction(0, "Notification Settings", pendingIntentSetting); + if (conn != null && mCurrentStatus.equals(STATUS_ON)) { + var pendingIntentNewNym = PendingIntent.getBroadcast(this, 0, new Intent(TorControlCommands.SIGNAL_NEWNYM), PendingIntent.FLAG_UPDATE_CURRENT|PendingIntent.FLAG_IMMUTABLE); + mNotifyBuilder.addAction(R.drawable.ic_refresh_white_24dp, getString(R.string.menu_new_identity), pendingIntentNewNym); + + var pendingIntentNotification = PendingIntent.getBroadcast(this, 0, new Intent(CMD_SETTING), PendingIntent.FLAG_UPDATE_CURRENT|PendingIntent.FLAG_IMMUTABLE); + mNotifyBuilder.addAction(0, "Notification Settings", pendingIntentNotification); + } } - mNotifyBuilder.setContentText(notifyMsg) .setSmallIcon(icon) .setTicker(notifyType != NOTIFY_ID ? notifyMsg : null); @@ -249,6 +251,10 @@ public class OrbotService extends VpnService implements OrbotConstants { public int onStartCommand(Intent intent, int flags, int startId) { showToolbarNotification(getString(org.torproject.android.service.R.string.newnym), NOTIFY_ID, org.torproject.android.service.R.drawable.ic_stat_starting_tor_logo); + createNetworkStateReciever(); + IntentFilter mNetworkStateFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION); + registerReceiver(mNetworkStateReceiver , mNetworkStateFilter); + self = this; if (intent != null) mExecutor.execute(new org.torproject.android.service.OrbotService.IncomingIntentRouter(intent)); @@ -259,7 +265,7 @@ public class OrbotService extends VpnService implements OrbotConstants { } private void showDeactivatedNotification() { - showToolbarNotification(getString(R.string.open_orbot_to_connect_to_tor), NOTIFY_ID, R.drawable.ic_stat_starting_tor_logo); + //showToolbarNotification(getString(R.string.open_orbot_to_connect_to_tor), NOTIFY_ID, R.drawable.ic_stat_starting_tor_logo); } @Override @@ -268,8 +274,12 @@ public class OrbotService extends VpnService implements OrbotConstants { try { disableNotification(); clearNotifications(); - //unregisterReceiver(mNetworkStateReceiver); - //unregisterReceiver(mActionBroadcastReceiver); + if(mNetworkStateReceiver!=null){ + unregisterReceiver(mNetworkStateReceiver); + } + if(mActionBroadcastReceiver!=null){ + unregisterReceiver(mActionBroadcastReceiver); + } }catch (Exception ex){ Log.i("sad","asd"); ex.printStackTrace(); @@ -288,60 +298,73 @@ public class OrbotService extends VpnService implements OrbotConstants { super.onDestroy(); } - private final BroadcastReceiver mNetworkStateReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { + private BroadcastReceiver mNetworkStateReceiver = null; + private void createNetworkStateReciever(){ + try { + mNetworkStateReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { - SharedPreferences prefs = org.torproject.android.service.util.Prefs.getSharedPrefs(getApplicationContext()); + SharedPreferences prefs = org.torproject.android.service.util.Prefs.getSharedPrefs(getApplicationContext()); - boolean doNetworKSleep = prefs.getBoolean(PREF_DISABLE_NETWORK, true); + boolean doNetworKSleep = prefs.getBoolean(PREF_DISABLE_NETWORK, true); - final ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); - final NetworkInfo netInfo = cm.getActiveNetworkInfo(); + final ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); + final NetworkInfo netInfo = cm.getActiveNetworkInfo(); - boolean newConnectivityState; - if(netInfo != null && netInfo.isConnected()) { - // WE ARE CONNECTED: DO SOMETHING - newConnectivityState = true; - } - else { - // WE ARE NOT: DO SOMETHING ELSE - newConnectivityState = false; - } - - if (newConnectivityState != mConnectivity) { - mConnectivity = newConnectivityState; - orbotLocalConstants.mNetworkState = mConnectivity; - - if (mConnectivity){ - newIdentity(); - } - } - - if (doNetworKSleep) - { - //setTorNetworkEnabled (mConnectivity); - if (!mConnectivity) - { - //sendCallbackStatus(STATUS_OFF); - orbotLocalConstants.mTorLogsStatus = "No internet connection"; - if(orbotLocalConstants.mNotificationStatus!=0){ - showToolbarNotification(getString(R.string.newnym), getNotifyId(), R.drawable.ic_stat_tor_off); - showToolbarNotification("Genesis is sleeping | Internet connectivity issue",NOTIFY_ID,R.drawable.ic_stat_tor_off); + boolean newConnectivityState; + if(netInfo != null && netInfo.isConnected()) { + // WE ARE CONNECTED: DO SOMETHING + newConnectivityState = true; } - } - else - { - //sendCallbackStatus(STATUS_STARTING); - if(orbotLocalConstants.mNotificationStatus!=0){ - showToolbarNotification(getString(R.string.status_starting_up),NOTIFY_ID,R.drawable.ic_stat_starting_tor_logo); + else { + // WE ARE NOT: DO SOMETHING ELSE + newConnectivityState = false; } - } - } - orbotLocalConstants.mNetworkState = mConnectivity; + if (newConnectivityState != mConnectivity) { + mConnectivity = newConnectivityState; + orbotLocalConstants.mNetworkState = mConnectivity; + + if (mConnectivity){ + newIdentity(); + } + } + try { + sleep(100); + } catch (InterruptedException e) { + e.printStackTrace(); + } + if (doNetworKSleep) + { + //setTorNetworkEnabled (mConnectivity); + if (!mConnectivity) + { + //sendCallbackStatus(STATUS_OFF); + orbotLocalConstants.mTorLogsStatus = "No internet connection"; + if(orbotLocalConstants.mNotificationStatus!=0){ + showToolbarNotification(getString(R.string.newnym), getNotifyId(), R.drawable.ic_stat_tor_off); + showToolbarNotification("Genesis is sleeping | Internet connectivity issue",NOTIFY_ID,R.drawable.ic_stat_tor_off); + } + } + else + { + //sendCallbackStatus(STATUS_STARTING); + + if(orbotLocalConstants.mNotificationStatus!=0){ + showToolbarNotification(getString(R.string.status_starting_up),NOTIFY_ID,R.drawable.ic_stat_starting_tor_logo); + } + } + + } + orbotLocalConstants.mNetworkState = mConnectivity; + } + }; + }catch (Exception ex){ + Log.i("asd","asd"); } - }; + Log.i("asd","asd"); + } public int getNotifyId() { return NOTIFY_ID; } @@ -579,6 +602,7 @@ public class OrbotService extends VpnService implements OrbotConstants { IntentFilter filter = new IntentFilter(TorControlCommands.SIGNAL_NEWNYM); filter.addAction(CMD_ACTIVE); + filter.addAction(CMD_SETTING); filter.addAction(ACTION_STATUS); filter.addAction(LOCAL_ACTION_NOTIFICATION_START); @@ -869,14 +893,14 @@ public class OrbotService extends VpnService implements OrbotConstants { while ((conn = torService.getTorControlConnection())==null) { try { - Thread.sleep(500); + sleep(500); } catch (InterruptedException e) { e.printStackTrace(); } } try { - Thread.sleep(1000); + sleep(1000); } catch (InterruptedException e) { e.printStackTrace(); } @@ -1214,7 +1238,7 @@ public class OrbotService extends VpnService implements OrbotConstants { } void showBandwidthNotification(String message, boolean isActiveTransfer) { - if (!mCurrentStatus.equals(STATUS_ON)) return; + if (!mCurrentStatus.equals(STATUS_ON) || !mConnectivity) return; var icon = !isActiveTransfer ? R.mipmap.ic_stat_tor_logo : R.mipmap.ic_stat_tor_logo; showToolbarNotification(message, NOTIFY_ID, icon); } @@ -1270,7 +1294,7 @@ public class OrbotService extends VpnService implements OrbotConstants { if (v3auths != null) { for (File file : mV3AuthBasePath.listFiles()) { if (!file.isDirectory()) - file.delete(); // todo the adapter should maybe just write these files and not do this in service... + file.delete(); } torrc.append("ClientOnionAuthDir " + mV3AuthBasePath.getAbsolutePath()).append('\n'); try { @@ -1569,6 +1593,9 @@ public class OrbotService extends VpnService implements OrbotConstants { case TorControlCommands.SIGNAL_NEWNYM: newIdentity(); break; + case CMD_SETTING: + onSettingRegister(); + break; case CMD_ACTIVE: sendSignalActive(); break; @@ -1594,6 +1621,7 @@ public class OrbotService extends VpnService implements OrbotConstants { private class ActionBroadcastReceiver extends BroadcastReceiver { public void onReceive(Context context, Intent intent) { + switch (intent.getAction()) { case TorControlCommands.SIGNAL_NEWNYM: { newIdentity(); @@ -1609,6 +1637,7 @@ public class OrbotService extends VpnService implements OrbotConstants { } case CMD_SETTING: { onSettingRegister(); + sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)); break; } case ACTION_STATUS: { diff --git a/orbotmanager/src/main/java/org/torproject/android/service/wrapper/orbotLocalConstants.java b/orbotmanager/src/main/java/org/torproject/android/service/wrapper/orbotLocalConstants.java index d8106363..1f84e30d 100644 --- a/orbotmanager/src/main/java/org/torproject/android/service/wrapper/orbotLocalConstants.java +++ b/orbotmanager/src/main/java/org/torproject/android/service/wrapper/orbotLocalConstants.java @@ -10,7 +10,7 @@ public class orbotLocalConstants { public static ArrayList mTorLogsHistory = new ArrayList<>(); public static String mTorLogsStatus = "Loading..."; - public static boolean mIsTorInitialized = true; + public static boolean mIsTorInitialized = false; public static boolean mForcedQuit = false; public static int mNotificationStatus = 0; public static WeakReference mHomeContext; diff --git a/orbotmanager/src/main/res/values/strings.xml b/orbotmanager/src/main/res/values/strings.xml index d14a77e6..70b1a0a0 100644 --- a/orbotmanager/src/main/res/values/strings.xml +++ b/orbotmanager/src/main/res/values/strings.xml @@ -25,8 +25,8 @@ Waiting for control port… Connecting to control port: - KiB/s - MiB/s + KB/s + MB/s %s Your snowflake proxy helped someone circumvent censorship %s