From ed6967bdfaddfdb2d5a525e5cb10d31277cbd1e8 Mon Sep 17 00:00:00 2001 From: Abdul Mannan Saeed <111820160@umt.edu.pk> Date: Tue, 19 Apr 2022 00:50:40 -0700 Subject: [PATCH] Bug Fixes Bug Fixes --- .../main/assets/homepage/homepage-dark.html | 4 +-- app/src/main/assets/homepage/homepage.html | 4 +-- .../geckoManager/geckoClients.java | 13 +++++++++ .../homeController/homeController.java | 6 ++-- .../android/service/OrbotService.java | 29 ++++++++----------- 5 files changed, 32 insertions(+), 24 deletions(-) diff --git a/app/src/main/assets/homepage/homepage-dark.html b/app/src/main/assets/homepage/homepage-dark.html index 0606b0e9..62a7d2f3 100755 --- a/app/src/main/assets/homepage/homepage-dark.html +++ b/app/src/main/assets/homepage/homepage-dark.html @@ -85,7 +85,7 @@

Playstore

-

Locations

+

Locations

Onion List

Submit Website

@@ -105,7 +105,7 @@
-
Location
+
Location
About & Policy Report Sitemap Links
diff --git a/app/src/main/assets/homepage/homepage.html b/app/src/main/assets/homepage/homepage.html index 6fb8d133..88f4d75f 100755 --- a/app/src/main/assets/homepage/homepage.html +++ b/app/src/main/assets/homepage/homepage.html @@ -83,7 +83,7 @@

Playstore

-

Locations

+

Locations

Onion List

Submit Website

@@ -103,7 +103,7 @@
- Location + Location Intelligence
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 ce975e33..85a944e6 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 @@ -570,6 +570,19 @@ public class geckoClients } } + public void onReloadDelay(NestedGeckoView mNestedGeckoView, AppCompatActivity pcontext, boolean isThemeCall){ + new Handler().postDelayed(() -> + { + mSession.stop(); + String url = mSession.getCurrentURL(); + if(url.startsWith("http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/?pG") || url.startsWith("https://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion?pG") || url.endsWith("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") || url.contains(constants.CONST_GENESIS_HELP_URL_SUB) || url.contains(constants.CONST_GENESIS_HELP_URL_CACHE) || url.contains(constants.CONST_GENESIS_HELP_URL_CACHE_DARK)){ + loadURL(mSession.getCurrentURL(), mNestedGeckoView, pcontext); + }else if(!isThemeCall){ + mSession.reload(); + } + }, 1000); + } + public void onReloadStatic(NestedGeckoView mNestedGeckoView, AppCompatActivity pcontext){ ///mSession.stop(); loadURL(mSession.getCurrentURL(), mNestedGeckoView, pcontext); 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 49cef756..0a3e7e24 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 @@ -1588,7 +1588,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba if(status.sSettingIsAppStarted && !status.mThemeApplying){ if(mGeckoClient.getSession().wasPreviousErrorPage()){ pluginController.getInstance().onOrbotInvoke(null, pluginEnums.eOrbotManager.M_NEW_CIRCUIT); - mGeckoClient.onReload(mGeckoView, this, false); + mGeckoClient.onReloadDelay(mGeckoView, this, false); } } @@ -1965,7 +1965,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); + mGeckoClient.onReloadDelay(mGeckoView, this, false); onLoadURL(mSearchbar.getText().toString()); } else if (menuId == R.id.pMenuOpenCurrentTab) @@ -2705,7 +2705,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba else if(e_type.equals(enums.etype.M_NEW_IDENTITY_MESSAGED)){ pluginController.getInstance().onOrbotInvoke(null, pluginEnums.eOrbotManager.M_NEW_CIRCUIT); pluginController.getInstance().onMessageManagerInvoke(Collections.singletonList(homeController.this), M_NEW_IDENTITY); - mGeckoClient.onReload(mGeckoView, homeController.this, false); + mGeckoClient.onReloadDelay(mGeckoView, homeController.this, false); } else if(e_type.equals(enums.etype.M_INDEX_WEBSITE)){ dataController.getInstance().invokeCrawler(dataEnums.eCrawlerCommands.M_INDEX_URL, data); 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 1595bd31..290d7b51 100644 --- a/orbotmanager/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotmanager/src/main/java/org/torproject/android/service/OrbotService.java @@ -1027,27 +1027,22 @@ public class OrbotService extends VpnService implements OrbotConstants { } public void newIdentity() { - //it is possible to not have a connection yet, and someone might try to newnym - if (conn != null) { - new Thread() { - public void run() { - try { - if (conn != null && mCurrentStatus.equals(STATUS_ON)) - showToolbarNotification(getString(R.string.newnym), NOTIFY_ID, R.drawable.ic_stat_starting_tor_logo); - + if (conn == null) return; + new Thread() { + public void run() { + try { + if (conn != null && mCurrentStatus.equals(STATUS_ON)) { + mNotifyBuilder.setSubText(null); // clear previous exit node info if present + showToolbarNotification(getString(R.string.newnym), NOTIFY_ID, R.drawable.ic_stat_starting_tor_logo); conn.signal(TorControlCommands.SIGNAL_NEWNYM); - - sleep(1000); - if(mConnectivity) - enableNotification(); - - } catch (Exception ioe) { - debug("error requesting newnym: " + ioe.getLocalizedMessage()); } + } catch (Exception ioe) { + debug("error requesting newnym: " + ioe.getLocalizedMessage()); } - }.start(); - } + } + }.start(); } + protected void sendCallbackBandwidth(long lastWritten, long lastRead, long totalWritten, long totalRead) { Intent intent = new Intent(LOCAL_ACTION_BANDWIDTH);