JoJo
/
LeOS-Genesis
mirror of https://github.com/LeOS-GSI/LeOS-Genesis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug Fixes 

Bug Fixes
master
Abdul Mannan Saeed 2022-08-20 17:51:54 +05:00
parent 7d7514265e
commit edcd452fcc
24 changed files with 170 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.idea/deploymentTargetDropDown.xml Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<targetSelectedWithDropDown>
<Target>
<type value="QUICK_BOOT_TARGET" />
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="C:\Users\msman\.android\avd\Pixel_4_API_31_2.avd" />
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2022-08-18T13:09:12.710571200Z" />
</component>
</project>

4
app/build.gradle
View File

@ -36,10 +36,6 @@ android {
proguardFiles getDefaultProguardFile(project.ext.proguard_file), project.ext.proguard_rule proguardFiles getDefaultProguardFile(project.ext.proguard_file), project.ext.proguard_rule
} }
} }
lintOptions {
checkReleaseBuilds project.ext.checkReleaseBuilds
abortOnError project.ext.abortOnError
}
flavorDimensions project.ext.dimen flavorDimensions project.ext.dimen

12
app/src/main/assets/homepage/homepage-dark.html
View File

@ -67,7 +67,7 @@
<!--search bar--> <!--search bar-->
<form method="GET" style="margin-top:-20px" <form method="GET" style="margin-top:-20px"
action="http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/search" action="http://167.86.99.31/search"
enctype="multipart/form-data"><img class="hi_logo_text" style="padding-left:42px;padding-right:42px;" enctype="multipart/form-data"><img class="hi_logo_text" style="padding-left:42px;padding-right:42px;"
alt="Genesis Search"> alt="Genesis Search">
<input autocomplete="off" autocapitalize="off" type="text" <input autocomplete="off" autocapitalize="off" type="text"
@ -121,24 +121,24 @@
class="sidebar__list-info--color">Locations</span></a></p> class="sidebar__list-info--color">Locations</span></a></p>
<hr class="sidebar__line-divider"> <hr class="sidebar__line-divider">
<p><a class="sidebar__list-info" <p><a class="sidebar__list-info"
href="http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/directory"><span href="http://167.86.99.31/directory"><span
class="sidebar__list-icon fas fa-list"></span><span class="sidebar__list-icon fas fa-list"></span><span
class="sidebar__list-info--color">Onion List</span></a></p> class="sidebar__list-info--color">Onion List</span></a></p>
<p><a class="sidebar__list-info" <p><a class="sidebar__list-info"
href="http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/sitemap"><span href="http://167.86.99.31/sitemap"><span
class="sidebar__list-icon fas fa-cloud-upload-alt"></span><span class="sidebar__list-icon fas fa-cloud-upload-alt"></span><span
class="sidebar__list-info--color">Submit Website</span></a></p> class="sidebar__list-info--color">Submit Website</span></a></p>
<p><a class="sidebar__list-info" <p><a class="sidebar__list-info"
href="http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/report"><span href="http://167.86.99.31/report"><span
class="sidebar__list-icon fas fa-bug"></span><span class="sidebar__list-icon fas fa-bug"></span><span
class="sidebar__list-info--color">Report Website</span></a></p> class="sidebar__list-info--color">Report Website</span></a></p>
<hr class="sidebar__line-divider"> <hr class="sidebar__line-divider">
<p><a class="sidebar__list-info" <p><a class="sidebar__list-info"
href="http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/privacy"><span href="http://167.86.99.31/privacy"><span
class="sidebar__list-icon--padding sidebar__list-icon fas fa-file-alt"></span><span class="sidebar__list-icon--padding sidebar__list-icon fas fa-file-alt"></span><span
class="sidebar__list-info--color">Privacy Policy</span></a></p> class="sidebar__list-info--color">Privacy Policy</span></a></p>
<p><a class="sidebar__list-info" <p><a class="sidebar__list-info"
href="http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/privacy"><span href="http://167.86.99.31/privacy"><span
class="sidebar__list-icon--padding sidebar__list-icon fas fas fa-eye"></span><span class="sidebar__list-icon--padding sidebar__list-icon fas fas fa-eye"></span><span
class="sidebar__list-info--color">Intelligence</span></a></p> class="sidebar__list-info--color">Intelligence</span></a></p>
<hr class="sidebar__line-divider"> <hr class="sidebar__line-divider">

12
app/src/main/assets/homepage/homepage.html
View File

@ -68,7 +68,7 @@
<!--Genesis bar--> <!--Genesis bar-->
<form method="GET" <form method="GET"
action="http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/search" action="http://167.86.99.31/search"
enctype="multipart/form-data"><img class="home__logo" style="padding-left:42px;padding-right:42px;" enctype="multipart/form-data"><img class="home__logo" style="padding-left:42px;padding-right:42px;"
alt="loading..."> alt="loading...">
<div class="home__search-container"> <div class="home__search-container">
@ -117,24 +117,24 @@
class="sidebar__list-info--color">Locations</span></a></p> class="sidebar__list-info--color">Locations</span></a></p>
<hr class="sidebar__line-divider"> <hr class="sidebar__line-divider">
<p><a class="sidebar__list-info" <p><a class="sidebar__list-info"
href="http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/directory"><span href="http://167.86.99.31/directory"><span
class="sidebar__list-icon fas fa-list"></span><span class="sidebar__list-icon fas fa-list"></span><span
class="sidebar__list-info--color">Onion List</span></a></p> class="sidebar__list-info--color">Onion List</span></a></p>
<p><a class="sidebar__list-info" <p><a class="sidebar__list-info"
href="http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/sitemap"><span href="http://167.86.99.31/sitemap"><span
class="sidebar__list-icon fas fa-cloud-upload-alt"></span><span class="sidebar__list-icon fas fa-cloud-upload-alt"></span><span
class="sidebar__list-info--color">Submit Website</span></a></p> class="sidebar__list-info--color">Submit Website</span></a></p>
<p><a class="sidebar__list-info" <p><a class="sidebar__list-info"
href="http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/report"><span href="http://167.86.99.31/report"><span
class="sidebar__list-icon fas fa-bug"></span><span class="sidebar__list-icon fas fa-bug"></span><span
class="sidebar__list-info--color">Report Website</span></a></p> class="sidebar__list-info--color">Report Website</span></a></p>
<hr class="sidebar__line-divider"> <hr class="sidebar__line-divider">
<p><a class="sidebar__list-info" <p><a class="sidebar__list-info"
href="http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/privacy"><span href="http://167.86.99.31/privacy"><span
class="sidebar__list-icon--padding sidebar__list-icon fas fa-file-alt"></span><span class="sidebar__list-icon--padding sidebar__list-icon fas fa-file-alt"></span><span
class="sidebar__list-info--color">Privacy Policy</span></a></p> class="sidebar__list-info--color">Privacy Policy</span></a></p>
<p><a class="sidebar__list-info" <p><a class="sidebar__list-info"
href="http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/intelligence"><span href="http://167.86.99.31/intelligence"><span
class="sidebar__list-icon--padding sidebar__list-icon fas fa-eye"></span><span class="sidebar__list-icon--padding sidebar__list-icon fas fa-eye"></span><span
class="sidebar__list-info--color">Intelligence</span></a></p> class="sidebar__list-info--color">Intelligence</span></a></p>
<hr class="sidebar__line-divider"> <hr class="sidebar__line-divider">

2
app/src/main/java/com/hiddenservices/onionservices/appManager/bookmarkManager/bookmarkHome/bookmarkAdapter.java
View File

@ -446,7 +446,7 @@ public class bookmarkAdapter extends RecyclerView.Adapter<bookmarkAdapter.listVi
mDescription.setText("https://" + mDescription.getText().toString()); mDescription.setText("https://" + mDescription.getText().toString());
} }
if (model.getDescription().contains("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") || model.getDescription().contains("orion.onion")) { if (model.getDescription().contains("167.86.99.31") || model.getDescription().contains("orion.onion")) {
mFaviconLogo.setImageDrawable(itemView.getResources().getDrawable(R.drawable.genesis)); mFaviconLogo.setImageDrawable(itemView.getResources().getDrawable(R.drawable.genesis));
} else { } else {
mEvent.invokeObserver(Arrays.asList(mFaviconLogo, "http://" + helperMethod.getDomainName(model.getDescription())), enums.etype.fetch_favicon); mEvent.invokeObserver(Arrays.asList(mFaviconLogo, "http://" + helperMethod.getDomainName(model.getDescription())), enums.etype.fetch_favicon);

2
app/src/main/java/com/hiddenservices/onionservices/appManager/historyManager/historyAdapter.java
View File

@ -514,7 +514,7 @@ public class historyAdapter extends RecyclerView.Adapter<historyAdapter.listView
mWebLogo.setText((helperMethod.getDomainName(model.getHeader()).toUpperCase().charAt(0) + "")); mWebLogo.setText((helperMethod.getDomainName(model.getHeader()).toUpperCase().charAt(0) + ""));
String header = model.getHeader(); String header = model.getHeader();
if (model.getDescription().contains("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") || model.getDescription().contains("orion.onion")) { if (model.getDescription().contains("167.86.99.31") || model.getDescription().contains("orion.onion")) {
mFaviconLogo.setImageDrawable(itemView.getResources().getDrawable(R.drawable.genesis)); mFaviconLogo.setImageDrawable(itemView.getResources().getDrawable(R.drawable.genesis));
} else { } else {
mEvent.invokeObserver(Arrays.asList(mFaviconLogo, "https://" + helperMethod.getDomainName(model.getDescription())), enums.etype.fetch_favicon); mEvent.invokeObserver(Arrays.asList(mFaviconLogo, "https://" + helperMethod.getDomainName(model.getDescription())), enums.etype.fetch_favicon);

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

@ -44,6 +44,8 @@ import static org.mozilla.geckoview.StorageController.ClearFlags.SITE_DATA;
import static org.mozilla.geckoview.StorageController.ClearFlags.SITE_SETTINGS; import static org.mozilla.geckoview.StorageController.ClearFlags.SITE_SETTINGS;
import org.json.JSONObject; import org.json.JSONObject;
import org.mozilla.gecko.EventDispatcher;
import org.mozilla.gecko.util.GeckoBundle;
import org.mozilla.geckoview.ContentBlocking; import org.mozilla.geckoview.ContentBlocking;
import org.mozilla.geckoview.GeckoResult; import org.mozilla.geckoview.GeckoResult;
import org.mozilla.geckoview.GeckoRuntime; import org.mozilla.geckoview.GeckoRuntime;
@ -122,7 +124,7 @@ public class geckoClients {
loadURL(mSession.getCurrentURL(), mNestedGeckoView, pcontext); loadURL(mSession.getCurrentURL(), mNestedGeckoView, pcontext);
} else { } else {
String mURL = mSession.getCurrentURL(); String mURL = mSession.getCurrentURL();
if (mURL.equals("http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") || mURL.startsWith(CONST_GENESIS_URL_CACHED) || mURL.startsWith(CONST_GENESIS_URL_CACHED_DARK)) { if (mURL.equals("http://167.86.99.31") || mURL.startsWith(CONST_GENESIS_URL_CACHED) || mURL.startsWith(CONST_GENESIS_URL_CACHED_DARK)) {
if (!mSession.canGoBack()) { if (!mSession.canGoBack()) {
mNestedGeckoView.releaseSession(); mNestedGeckoView.releaseSession();
mSession.close(); mSession.close();
@ -131,7 +133,7 @@ public class geckoClients {
} else { } else {
mSession.goBack(); mSession.goBack();
} }
loadURL("http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion", mNestedGeckoView, pcontext); loadURL("http://167.86.99.31", mNestedGeckoView, pcontext);
} }
} }
} }
@ -295,6 +297,39 @@ public class geckoClients {
static boolean mCreated = false; static boolean mCreated = false;
/* package */ class Pref<T> {
public final String name;
public final T defaultValue;
private T mValue;
private boolean mIsSet;
public Pref(@NonNull final String name, final T defaultValue) {
this.name = name;
this.defaultValue = defaultValue;
mValue = defaultValue;
}
public void add() {
final GeckoBundle prefs = new GeckoBundle(1);
prefs.putInt(this.name, (Integer)this.defaultValue);
EventDispatcher.getInstance().dispatch("GeckoView:SetDefaultPrefs", prefs);
addToBundle(prefs);
}
private void addToBundle(final GeckoBundle bundle) {
final T value = mIsSet ? mValue : defaultValue;
if (value instanceof String) {
bundle.putString(name, (String) value);
} else if (value instanceof Integer) {
bundle.putInt(name, (Integer) value);
} else if (value instanceof Boolean) {
bundle.putBoolean(name, (Boolean) value);
} else {
throw new UnsupportedOperationException("Unhandled pref type for " + name);
}
}
}
@SuppressLint("WrongConstant") @SuppressLint("WrongConstant")
public void initRuntimeSettings(AppCompatActivity context) { public void initRuntimeSettings(AppCompatActivity context) {
if (mRuntime == null) { if (mRuntime == null) {
@ -434,10 +469,12 @@ public class geckoClients {
} }
public void loadURL(String url, NestedGeckoView mNestedGeckoView, AppCompatActivity pcontext) { public void loadURL(String url, NestedGeckoView mNestedGeckoView, AppCompatActivity pcontext) {
if (url.startsWith("https://orion.onion/privacy")) { if (url.startsWith("https://orion.onion/privacy")) {
url = CONST_PRIVACY_POLICY_URL_NON_TOR; url = CONST_PRIVACY_POLICY_URL_NON_TOR;
} }
if (!status.sTorBrowsing && url.equals("https://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/privacy")) { if (!status.sTorBrowsing && url.equals("https://167.86.99.31/privacy")) {
url = CONST_PRIVACY_POLICY_URL_NON_TOR; url = CONST_PRIVACY_POLICY_URL_NON_TOR;
} }
@ -449,7 +486,7 @@ public class geckoClients {
Log.i("FERROR : ", "FERROR" + url); Log.i("FERROR : ", "FERROR" + url);
if (mSession.onGetInitializeFromStartup()) { if (mSession.onGetInitializeFromStartup()) {
mSession.initURL(url); 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))) { if (!url.startsWith(CONST_REPORT_URL) && (url.startsWith("http://167.86.99.31/?pG") || url.startsWith("https://167.86.99.31?pG") || url.endsWith("167.86.99.31") || url.endsWith(constants.CONST_GENESIS_DOMAIN_URL_SLASHED))) {
try { try {
mSession.initURL(constants.CONST_GENESIS_DOMAIN_URL); mSession.initURL(constants.CONST_GENESIS_DOMAIN_URL);
if (status.sTheme == enums.Theme.THEME_LIGHT || helperMethod.isDayMode(pcontext)) { if (status.sTheme == enums.Theme.THEME_LIGHT || helperMethod.isDayMode(pcontext)) {
@ -598,7 +635,7 @@ public class geckoClients {
public void onReload(NestedGeckoView mNestedGeckoView, AppCompatActivity pcontext, boolean isThemeCall) { public void onReload(NestedGeckoView mNestedGeckoView, AppCompatActivity pcontext, boolean isThemeCall) {
mSession.stop(); mSession.stop();
String url = mSession.getCurrentURL(); 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)) { if (url.startsWith("http://167.86.99.31/?pG") || url.startsWith("https://167.86.99.31?pG") || url.endsWith("167.86.99.31") || 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); loadURL(mSession.getCurrentURL(), mNestedGeckoView, pcontext);
} else if (!isThemeCall) { } else if (!isThemeCall) {
mSession.reload(); mSession.reload();
@ -610,7 +647,7 @@ public class geckoClients {
{ if(mSession != null){ { if(mSession != null){
mSession.stop(); mSession.stop();
String url = mSession.getCurrentURL(); 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)) { if (url.startsWith("http://167.86.99.31/?pG") || url.startsWith("https://167.86.99.31?pG") || url.endsWith("167.86.99.31") || 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); loadURL(mSession.getCurrentURL(), mNestedGeckoView, pcontext);
} else if (!isThemeCall) { } else if (!isThemeCall) {
mSession.reload(); mSession.reload();

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

@ -44,6 +44,8 @@ import com.example.myapplication.R;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import org.mozilla.gecko.EventDispatcher;
import org.mozilla.gecko.util.GeckoBundle;
import org.mozilla.gecko.util.ThreadUtils; import org.mozilla.gecko.util.ThreadUtils;
import org.mozilla.geckoview.AllowOrDeny; import org.mozilla.geckoview.AllowOrDeny;
import org.mozilla.geckoview.Autofill; import org.mozilla.geckoview.Autofill;
@ -496,7 +498,7 @@ geckoSession extends GeckoSession implements MediaSession.Delegate, GeckoSession
} }
public void onProgressStart() { public void onProgressStart() {
if (!getCurrentURL().equals("about:config") && !getCurrentURL().equals("about:blank") && !getCurrentURL().contains("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") && !wasPreviousErrorPage() && !getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED) && !getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED_DARK) && !getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE) && !getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE_DARK)) { if (!getCurrentURL().equals("about:config") && !getCurrentURL().equals("about:blank") && !getCurrentURL().contains("167.86.99.31") && !wasPreviousErrorPage() && !getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED) && !getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED_DARK) && !getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE) && !getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE_DARK)) {
mContext.get().runOnUiThread(() -> event.invokeObserver(Arrays.asList(5, mSessionID), enums.etype.progress_update)); mContext.get().runOnUiThread(() -> event.invokeObserver(Arrays.asList(5, mSessionID), enums.etype.progress_update));
} }
} }
@ -562,7 +564,7 @@ geckoSession extends GeckoSession implements MediaSession.Delegate, GeckoSession
} }
if (wasBackPressed && mPastURLVerify) { if (wasBackPressed && mPastURLVerify) {
if (var2.equals("http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") || var2.startsWith(CONST_GENESIS_URL_CACHED) || var2.startsWith(CONST_GENESIS_URL_CACHED_DARK)) { if (var2.equals("http://167.86.99.31") || var2.startsWith(CONST_GENESIS_URL_CACHED) || var2.startsWith(CONST_GENESIS_URL_CACHED_DARK)) {
if (var2.startsWith(CONST_GENESIS_URL_CACHED_DARK) && (status.sTheme == enums.Theme.THEME_LIGHT || helperMethod.isDayMode(mContext.get()))) { if (var2.startsWith(CONST_GENESIS_URL_CACHED_DARK) && (status.sTheme == enums.Theme.THEME_LIGHT || helperMethod.isDayMode(mContext.get()))) {
isPageLoading = false; isPageLoading = false;
event.invokeObserver(null, enums.etype.M_CHANGE_HOME_THEME); event.invokeObserver(null, enums.etype.M_CHANGE_HOME_THEME);
@ -610,8 +612,47 @@ geckoSession extends GeckoSession implements MediaSession.Delegate, GeckoSession
} }
} }
/* package */ class Pref<T> {
public final String name;
public final T defaultValue;
private T mValue;
private boolean mIsSet;
public Pref(@NonNull final String name, final T defaultValue) {
this.name = name;
this.defaultValue = defaultValue;
mValue = defaultValue;
}
public void add() {
final GeckoBundle prefs = new GeckoBundle(1);
prefs.putInt(this.name, (Integer)this.defaultValue);
EventDispatcher.getInstance().dispatch("GeckoView:SetDefaultPrefs", prefs);
addToBundle(prefs);
}
private void addToBundle(final GeckoBundle bundle) {
final T value = mIsSet ? mValue : defaultValue;
if (value instanceof String) {
bundle.putString(name, (String) value);
} else if (value instanceof Integer) {
bundle.putInt(name, (Integer) value);
} else if (value instanceof Boolean) {
bundle.putBoolean(name, (Boolean) value);
} else {
throw new UnsupportedOperationException("Unhandled pref type for " + name);
}
}
}
public GeckoResult<AllowOrDeny> onLoadRequest(@NonNull GeckoSession var2, @NonNull GeckoSession.NavigationDelegate.LoadRequest var1) { public GeckoResult<AllowOrDeny> onLoadRequest(@NonNull GeckoSession var2, @NonNull GeckoSession.NavigationDelegate.LoadRequest var1) {
if (var1.uri.contains("167.86.99.31")) {
new Pref<Integer>("network.proxy.type", 0).add();
}else {
new Pref<Integer>("network.proxy.type", 1).add();
}
String m_url = var1.uri; String m_url = var1.uri;
if (helperMethod.getHost(m_url).endsWith(".onion")) { if (helperMethod.getHost(m_url).endsWith(".onion")) {
m_url = m_url.replace("www.", ""); m_url = m_url.replace("www.", "");
@ -623,12 +664,12 @@ geckoSession extends GeckoSession implements MediaSession.Delegate, GeckoSession
return GeckoResult.fromValue(AllowOrDeny.DENY); return GeckoResult.fromValue(AllowOrDeny.DENY);
} }
String mNormalizeURL = helperMethod.normalize(m_url); String mNormalizeURL = helperMethod.normalize(m_url);
if (mNormalizeURL != null && mNormalizeURL.endsWith("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion")) { if (mNormalizeURL != null && mNormalizeURL.endsWith("167.86.99.31")) {
initURL(constants.CONST_GENESIS_DOMAIN_URL); initURL(constants.CONST_GENESIS_DOMAIN_URL);
event.invokeObserver(Arrays.asList(mCurrentURL, mSessionID, mCurrentTitle, false), enums.etype.M_LOAD_HOMEPAGE_GENESIS); event.invokeObserver(Arrays.asList(mCurrentURL, mSessionID, mCurrentTitle, false), enums.etype.M_LOAD_HOMEPAGE_GENESIS);
return GeckoResult.fromValue(AllowOrDeny.DENY); return GeckoResult.fromValue(AllowOrDeny.DENY);
} }
if (!m_url.contains(constants.CONST_GENESIS_GMT_TIME_GET_KEY) && !m_url.startsWith(CONST_GENESIS_URL_CACHED) && !m_url.startsWith(CONST_GENESIS_URL_CACHED_DARK) && var1.uri.startsWith("http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") && !var1.uri.contains(constants.CONST_GENESIS_LOCAL_TIME_GET_KEY) && !var1.uri.contains(constants.CONST_GENESIS_LOCAL_TIME_GET_KEY)) { if (!m_url.contains(constants.CONST_GENESIS_GMT_TIME_GET_KEY) && !m_url.startsWith(CONST_GENESIS_URL_CACHED) && !m_url.startsWith(CONST_GENESIS_URL_CACHED_DARK) && var1.uri.startsWith("http://167.86.99.31") && !var1.uri.contains(constants.CONST_GENESIS_LOCAL_TIME_GET_KEY) && !var1.uri.contains(constants.CONST_GENESIS_LOCAL_TIME_GET_KEY)) {
String mVerificationURL = setGenesisVerificationToken(m_url); String mVerificationURL = setGenesisVerificationToken(m_url);
initURL(mVerificationURL); initURL(mVerificationURL);
@ -637,10 +678,10 @@ geckoSession extends GeckoSession implements MediaSession.Delegate, GeckoSession
} else if (m_url.startsWith("mailto")) { } else if (m_url.startsWith("mailto")) {
event.invokeObserver(Arrays.asList(m_url, mSessionID), enums.etype.M_ON_MAIL); event.invokeObserver(Arrays.asList(m_url, mSessionID), enums.etype.M_ON_MAIL);
return GeckoResult.fromValue(AllowOrDeny.ALLOW); return GeckoResult.fromValue(AllowOrDeny.ALLOW);
} else if (m_url.contains("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/advert__")) { } else if (m_url.contains("167.86.99.31/advert__")) {
event.invokeObserver(Arrays.asList(m_url, mSessionID), enums.etype.on_playstore_load); event.invokeObserver(Arrays.asList(m_url, mSessionID), enums.etype.on_playstore_load);
return GeckoResult.fromValue(AllowOrDeny.DENY); return GeckoResult.fromValue(AllowOrDeny.DENY);
} else if (m_url.equals(constants.CONST_GENESIS_DOMAIN_URL_SLASHED) || m_url.startsWith("http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/?")) { } else if (m_url.equals(constants.CONST_GENESIS_DOMAIN_URL_SLASHED) || m_url.startsWith("http://167.86.99.31/?")) {
initURL(constants.CONST_GENESIS_DOMAIN_URL); initURL(constants.CONST_GENESIS_DOMAIN_URL);
event.invokeObserver(Arrays.asList(mCurrentURL, mSessionID, mCurrentTitle, false), enums.etype.M_LOAD_HOMEPAGE_GENESIS); event.invokeObserver(Arrays.asList(mCurrentURL, mSessionID, mCurrentTitle, false), enums.etype.M_LOAD_HOMEPAGE_GENESIS);
return GeckoResult.fromValue(AllowOrDeny.DENY); return GeckoResult.fromValue(AllowOrDeny.DENY);
@ -672,7 +713,7 @@ geckoSession extends GeckoSession implements MediaSession.Delegate, GeckoSession
event.invokeObserver(Arrays.asList(mCurrentURL, mSessionID, mCurrentTitle, m_current_url_id, mTheme, this), enums.etype.ON_UPDATE_SEARCH_BAR); event.invokeObserver(Arrays.asList(mCurrentURL, mSessionID, mCurrentTitle, m_current_url_id, mTheme, this), enums.etype.ON_UPDATE_SEARCH_BAR);
if (!m_url.equals("about:config") && !mCurrentURL.contains("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion")) { if (!m_url.equals("about:config") && !mCurrentURL.contains("167.86.99.31")) {
mProgress = 5; mProgress = 5;
onProgressStart(); onProgressStart();
} }
@ -781,7 +822,7 @@ geckoSession extends GeckoSession implements MediaSession.Delegate, GeckoSession
public void onFirstContentfulPaint(@NonNull GeckoSession var1) { public void onFirstContentfulPaint(@NonNull GeckoSession var1) {
isFirstPaintExecuted = true; isFirstPaintExecuted = true;
if (mPreviousErrorPage || mCurrentURL.contains("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") || mCurrentURL.startsWith(CONST_GENESIS_URL_CACHED) || mCurrentURL.startsWith(CONST_GENESIS_URL_CACHED_DARK) || mCurrentURL.startsWith(CONST_GENESIS_HELP_URL_CACHE) || mCurrentURL.startsWith(CONST_GENESIS_HELP_URL_CACHE_DARK)) { if (mPreviousErrorPage || mCurrentURL.contains("167.86.99.31") || mCurrentURL.startsWith(CONST_GENESIS_URL_CACHED) || mCurrentURL.startsWith(CONST_GENESIS_URL_CACHED_DARK) || mCurrentURL.startsWith(CONST_GENESIS_HELP_URL_CACHE) || mCurrentURL.startsWith(CONST_GENESIS_HELP_URL_CACHE_DARK)) {
event.invokeObserver(Arrays.asList(mCurrentURL, mSessionID, mCurrentTitle, false), enums.etype.M_ON_BANNER_UPDATE); event.invokeObserver(Arrays.asList(mCurrentURL, mSessionID, mCurrentTitle, false), enums.etype.M_ON_BANNER_UPDATE);
} else { } else {
event.invokeObserver(Arrays.asList(mCurrentURL, mSessionID, mCurrentTitle, true), enums.etype.M_ON_BANNER_UPDATE); event.invokeObserver(Arrays.asList(mCurrentURL, mSessionID, mCurrentTitle, true), enums.etype.M_ON_BANNER_UPDATE);

4
app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/hintManager/hintAdapter.java
View File

@ -171,7 +171,7 @@ public class hintAdapter extends RecyclerView.Adapter<hintAdapter.listViewHolder
} }
String m_url = model.getDescription(); String m_url = model.getDescription();
if (!status.sTorBrowsing && (m_url.equals("https://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/privacy") || m_url.equals(CONST_PRIVACY_POLICY_URL_NON_TOR))) { if (!status.sTorBrowsing && (m_url.equals("https://167.86.99.31/privacy") || m_url.equals(CONST_PRIVACY_POLICY_URL_NON_TOR))) {
m_url = "https://orion.onion/privacy"; m_url = "https://orion.onion/privacy";
} }
@ -196,7 +196,7 @@ public class hintAdapter extends RecyclerView.Adapter<hintAdapter.listViewHolder
mpHintListener.setOnTouchListener(listViewHolder.this); mpHintListener.setOnTouchListener(listViewHolder.this);
if (mURLLink.contains("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") || mURLLink.contains("orion.onion")) { if (mURLLink.contains("167.86.99.31") || mURLLink.contains("orion.onion")) {
pHintWebIconImage.setImageTintList(null); pHintWebIconImage.setImageTintList(null);
pHintWebIconImage.setImageDrawable(itemView.getResources().getDrawable(R.drawable.genesis)); pHintWebIconImage.setImageDrawable(itemView.getResources().getDrawable(R.drawable.genesis));
mPastWebIcon.put(getLayoutPosition(), pHintWebIconImage.getDrawable()); mPastWebIcon.put(getLayoutPosition(), pHintWebIconImage.getDrawable());

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

@ -393,7 +393,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
mGeckoClient.onSessionReinit(); mGeckoClient.onSessionReinit();
} }
if (mGeckoClient.getSession().getCurrentURL().equals("about:blank") || mGeckoClient.getSession().getCurrentURL().contains("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") || mGeckoClient.wasPreviousErrorPage() || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED_DARK) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE_DARK)) { if (mGeckoClient.getSession().getCurrentURL().equals("about:blank") || mGeckoClient.getSession().getCurrentURL().contains("167.86.99.31") || mGeckoClient.wasPreviousErrorPage() || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED_DARK) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE_DARK)) {
mHomeViewController.updateBannerAdvertStatus(false, (boolean) pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED)); mHomeViewController.updateBannerAdvertStatus(false, (boolean) pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED));
if (model.getSession().onGetInitializeFromStartup()) { if (model.getSession().onGetInitializeFromStartup()) {
mHomeViewController.progressBarReset(); mHomeViewController.progressBarReset();
@ -675,7 +675,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
if (mGeckoView.getSession() != null) { if (mGeckoView.getSession() != null) {
mGeckoView.getSession().stop(); mGeckoView.getSession().stop();
} }
mGeckoClient.loadURL(url.replace("orion.onion", "trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion"), mGeckoView, homeController.this); mGeckoClient.loadURL(url.replace("orion.onion", "167.86.99.31"), mGeckoView, homeController.this);
} }
public String getSecurityInfo() { public String getSecurityInfo() {
@ -730,7 +730,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
mHomeViewController.expandTopBar(false, mGeckoView.getMaxY()); mHomeViewController.expandTopBar(false, mGeckoView.getMaxY());
} }
if (mGeckoClient.getSession().getCurrentURL().equals("about:blank") || mGeckoClient.getSession().getCurrentURL().contains("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") || mGeckoClient.wasPreviousErrorPage() || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED_DARK) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE_DARK)) { if (mGeckoClient.getSession().getCurrentURL().equals("about:blank") || mGeckoClient.getSession().getCurrentURL().contains("167.86.99.31") || mGeckoClient.wasPreviousErrorPage() || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED_DARK) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE_DARK)) {
mHomeViewController.updateBannerAdvertStatus(false, (boolean) pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED)); mHomeViewController.updateBannerAdvertStatus(false, (boolean) pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED));
} else { } else {
mHomeViewController.updateBannerAdvertStatus(true, (boolean) pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED)); mHomeViewController.updateBannerAdvertStatus(true, (boolean) pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED));
@ -1275,7 +1275,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
new Handler().postDelayed(() -> new Handler().postDelayed(() ->
{ {
dataController.getInstance().invokeTab(dataEnums.eTabCommands.M_UPDATE_PIXEL, Arrays.asList(mGeckoClient.getSession().getSessionID(), mRenderedBitmap, null, mGeckoView, false)); dataController.getInstance().invokeTab(dataEnums.eTabCommands.M_UPDATE_PIXEL, Arrays.asList(mGeckoClient.getSession().getSessionID(), mRenderedBitmap, null, mGeckoView, false));
if (status.sSettingDefaultSearchEngine.startsWith("http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") || !status.sOpenURLInNewTab || mGeckoClient.getSession().getCurrentURL().equals("about:blank") || mGeckoClient.getSession().getCurrentURL().contains("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") || mGeckoClient.wasPreviousErrorPage() || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED_DARK) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE_DARK)) { if (status.sSettingDefaultSearchEngine.startsWith("http://167.86.99.31") || !status.sOpenURLInNewTab || mGeckoClient.getSession().getCurrentURL().equals("about:blank") || mGeckoClient.getSession().getCurrentURL().contains("167.86.99.31") || mGeckoClient.wasPreviousErrorPage() || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED_DARK) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE_DARK)) {
mHomeViewController.updateBannerAdvertStatus(false, (boolean) pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED)); mHomeViewController.updateBannerAdvertStatus(false, (boolean) pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED));
} }
@ -1283,7 +1283,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
mGeckoClient.resetSession(); mGeckoClient.resetSession();
mHomeViewController.onUpdateSearchBar(helperMethod.getDomainName(mHomeModel.getSearchEngine()), false, false, false); mHomeViewController.onUpdateSearchBar(helperMethod.getDomainName(mHomeModel.getSearchEngine()), false, false, false);
if (status.sSettingDefaultSearchEngine.startsWith("http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion")) { if (status.sSettingDefaultSearchEngine.startsWith("http://167.86.99.31")) {
mHomeViewController.progressBarReset(); mHomeViewController.progressBarReset();
} else { } else {
mHomeViewController.onProgressBarUpdate(5, true); mHomeViewController.onProgressBarUpdate(5, true);
@ -1299,7 +1299,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
} }
public void onNewTabBackground(boolean isKeyboardOpenedTemp, boolean isKeyboardOpened) { public void onNewTabBackground(boolean isKeyboardOpenedTemp, boolean isKeyboardOpened) {
if (status.sSettingDefaultSearchEngine.startsWith("http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") || !status.sOpenURLInNewTab || mGeckoClient.getSession().getCurrentURL().equals("about:blank") || mGeckoClient.getSession().getCurrentURL().contains("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") || mGeckoClient.wasPreviousErrorPage() || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED_DARK) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE_DARK)) { if (status.sSettingDefaultSearchEngine.startsWith("http://167.86.99.31") || !status.sOpenURLInNewTab || mGeckoClient.getSession().getCurrentURL().equals("about:blank") || mGeckoClient.getSession().getCurrentURL().contains("167.86.99.31") || mGeckoClient.wasPreviousErrorPage() || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED_DARK) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE_DARK)) {
mHomeViewController.updateBannerAdvertStatus(false, (boolean) pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED)); mHomeViewController.updateBannerAdvertStatus(false, (boolean) pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED));
} }
@ -1307,7 +1307,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
mGeckoClient.resetSession(); mGeckoClient.resetSession();
mHomeViewController.onUpdateSearchBar(helperMethod.getDomainName(mHomeModel.getSearchEngine()), false, false, false); mHomeViewController.onUpdateSearchBar(helperMethod.getDomainName(mHomeModel.getSearchEngine()), false, false, false);
if (status.sSettingDefaultSearchEngine.startsWith("http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion")) { if (status.sSettingDefaultSearchEngine.startsWith("http://167.86.99.31")) {
mHomeViewController.progressBarReset(); mHomeViewController.progressBarReset();
} else { } else {
mHomeViewController.onProgressBarUpdate(5, true); mHomeViewController.onProgressBarUpdate(5, true);
@ -1328,7 +1328,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
handler.postDelayed(() -> { handler.postDelayed(() -> {
onGetThumbnail(null, false); onGetThumbnail(null, false);
mHomeViewController.expandTopBar(false, mGeckoView.getMaxY()); mHomeViewController.expandTopBar(false, mGeckoView.getMaxY());
if (status.sSettingDefaultSearchEngine.startsWith("http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") || !status.sOpenURLInNewTab || mGeckoClient.getSession().getCurrentURL().equals("about:blank") || mGeckoClient.getSession().getCurrentURL().contains("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") || mGeckoClient.wasPreviousErrorPage() || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED_DARK) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE_DARK)) { if (status.sSettingDefaultSearchEngine.startsWith("http://167.86.99.31") || !status.sOpenURLInNewTab || mGeckoClient.getSession().getCurrentURL().equals("about:blank") || mGeckoClient.getSession().getCurrentURL().contains("167.86.99.31") || mGeckoClient.wasPreviousErrorPage() || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED_DARK) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE_DARK)) {
mHomeViewController.updateBannerAdvertStatus(false, (boolean) pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED)); mHomeViewController.updateBannerAdvertStatus(false, (boolean) pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED));
} }
mHomeViewController.onNewTabAnimation(Collections.singletonList(url), M_INITIALIZE_TAB_LINK); mHomeViewController.onNewTabAnimation(Collections.singletonList(url), M_INITIALIZE_TAB_LINK);
@ -1377,7 +1377,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
helperMethod.hideKeyboard(this); helperMethod.hideKeyboard(this);
String url = mGeckoClient.getSession().getCurrentURL(); String url = mGeckoClient.getSession().getCurrentURL();
if (!status.sTorBrowsing && (url.equals("https://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/privacy") || url.equals(CONST_PRIVACY_POLICY_URL_NON_TOR))) { if (!status.sTorBrowsing && (url.equals("https://167.86.99.31/privacy") || url.equals(CONST_PRIVACY_POLICY_URL_NON_TOR))) {
url = "https://orion.onion/privacy"; url = "https://orion.onion/privacy";
} }
@ -1991,7 +1991,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
if (view.getTag() != null && view.getTag().equals("mMarked")) { if (view.getTag() != null && view.getTag().equals("mMarked")) {
Intent intent = new Intent(getApplicationContext(), bookmarkSettingController.class); Intent intent = new Intent(getApplicationContext(), bookmarkSettingController.class);
String url = mGeckoClient.getSession().getCurrentURL(); String url = mGeckoClient.getSession().getCurrentURL();
if (!status.sTorBrowsing && (url.equals("https://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/privacy") || url.equals(CONST_PRIVACY_POLICY_URL_NON_TOR))) { if (!status.sTorBrowsing && (url.equals("https://167.86.99.31/privacy") || url.equals(CONST_PRIVACY_POLICY_URL_NON_TOR))) {
url = "https://orion.onion/privacy"; url = "https://orion.onion/privacy";
} }
@ -2503,7 +2503,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
} else if (e_type.equals(M_CLOSE_TAB_BACK)) { } else if (e_type.equals(M_CLOSE_TAB_BACK)) {
mHomeViewController.onNewTabAnimation(Collections.singletonList(mGeckoClient.getSession()), M_CLOSE_TAB_BACK); mHomeViewController.onNewTabAnimation(Collections.singletonList(mGeckoClient.getSession()), M_CLOSE_TAB_BACK);
} else if (e_type.equals(enums.etype.M_ADMOB_BANNER_RECHECK)) { } else if (e_type.equals(enums.etype.M_ADMOB_BANNER_RECHECK)) {
if (data.get(2).toString().startsWith(CONST_GENESIS_URL_CACHED) || data.get(2).toString().startsWith(CONST_GENESIS_URL_CACHED_DARK) || helperMethod.getHost(data.get(2).toString()).contains("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") || data.get(2).toString().startsWith(CONST_GENESIS_HELP_URL_CACHE) || data.get(2).toString().startsWith(CONST_GENESIS_HELP_URL_CACHE_DARK)) { if (data.get(2).toString().startsWith(CONST_GENESIS_URL_CACHED) || data.get(2).toString().startsWith(CONST_GENESIS_URL_CACHED_DARK) || helperMethod.getHost(data.get(2).toString()).contains("167.86.99.31") || data.get(2).toString().startsWith(CONST_GENESIS_HELP_URL_CACHE) || data.get(2).toString().startsWith(CONST_GENESIS_HELP_URL_CACHE_DARK)) {
mHomeViewController.updateBannerAdvertStatus(false, true); mHomeViewController.updateBannerAdvertStatus(false, true);
} }
} else if (e_type.equals(enums.etype.ON_UPDATE_THEME)) { } else if (e_type.equals(enums.etype.ON_UPDATE_THEME)) {

2
app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeModel.java
View File

@ -23,7 +23,7 @@ class homeModel {
return pURL; return pURL;
} }
if (pURL.equals("about:blank")) { if (pURL.equals("about:blank")) {
return helperMethod.completeURL("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion"); return helperMethod.completeURL("167.86.99.31");
} else if (pURL.equals("about:config")) { } else if (pURL.equals("about:config")) {
return pURL; return pURL;
} else { } else {

2
app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeViewController.java
View File

@ -1288,7 +1288,7 @@ class homeViewController {
url = url.replace("http://", ""); url = url.replace("http://", "");
} }
url = url.replace("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion", "orion.onion"); url = url.replace("167.86.99.31", "orion.onion");
boolean isTextSelected = false; boolean isTextSelected = false;
if (mSearchbar.isSelected()) { if (mSearchbar.isSelected()) {

2
app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/generalManager/settingGeneralViewController.java
View File

@ -97,7 +97,7 @@ class settingGeneralViewController {
mOpenURLInNewTab.setChecked(false); mOpenURLInNewTab.setChecked(false);
} }
mHomePageText.setText(helperMethod.getDomainName(status.sSettingDefaultSearchEngine.replace("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion", "orion.onion"))); mHomePageText.setText(helperMethod.getDomainName(status.sSettingDefaultSearchEngine.replace("167.86.99.31", "orion.onion")));
} }
private void updateThemeChanger() { private void updateThemeChanger() {

2
app/src/main/java/com/hiddenservices/onionservices/appManager/tabManager/tabAdapter.java
View File

@ -346,7 +346,7 @@ public class tabAdapter extends RecyclerView.Adapter<tabAdapter.listViewHolder>
String mDescText = mDescription.getText().toString(); String mDescText = mDescription.getText().toString();
if (status.sTabGridLayoutEnabled) { if (status.sTabGridLayoutEnabled) {
if (model.getSession().getCurrentURL().contains("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") || model.getSession().getCurrentURL().contains("orion.onion")) { if (model.getSession().getCurrentURL().contains("167.86.99.31") || model.getSession().getCurrentURL().contains("orion.onion")) {
mLogo.setImageDrawable(itemView.getResources().getDrawable(R.drawable.genesis)); mLogo.setImageDrawable(itemView.getResources().getDrawable(R.drawable.genesis));
} else { } else {
if (mLogo.getDrawable() == null) { if (mLogo.getDrawable() == null) {

16
app/src/main/java/com/hiddenservices/onionservices/constants/constants.java
View File

@ -12,12 +12,12 @@ public class constants {
public static final String CONST_REPORT_URL_NON_TOR = "http://http://167.86.99.31/report?url="; public static final String CONST_REPORT_URL_NON_TOR = "http://http://167.86.99.31/report?url=";
public static final String CONST_SITEMAP_NON_TOR = "http://http://167.86.99.31/sitemap"; public static final String CONST_SITEMAP_NON_TOR = "http://http://167.86.99.31/sitemap";
public static final String CONST_PRIVACY_POLICY_URL = "http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/privacy"; public static final String CONST_PRIVACY_POLICY_URL = "http://167.86.99.31/privacy";
public static final String CONST_REPORT_URL = "http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/report?url="; public static final String CONST_REPORT_URL = "http://167.86.99.31/report?url=";
public static final String CONST_SITEMAP = "http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/sitemap"; public static final String CONST_SITEMAP = "http://167.86.99.31/sitemap";
public static final String CONST_PACKAGE_NAME = "com.hiddenservices.onionservices"; public static final String CONST_PACKAGE_NAME = "com.hiddenservices.onionservices";
public static final String CONST_GENESIS_ONION = "orion.onion"; public static final String CONST_GENESIS_ONION = "orion.onion";
public static final String CONST_GENESIS_ONION_V2 = "trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion"; public static final String CONST_GENESIS_ONION_V2 = "167.86.99.31";
/*DRIVE URL DEV*/ /*DRIVE URL DEV*/
@ -39,15 +39,15 @@ public class constants {
public static final String CONST_GENESIS_ERROR_CACHED_DARK = "error/error-dark.html"; public static final String CONST_GENESIS_ERROR_CACHED_DARK = "error/error-dark.html";
public static final String CONST_GENESIS_BADCERT_CACHED = "error/badcert.html"; public static final String CONST_GENESIS_BADCERT_CACHED = "error/badcert.html";
public static final String CONST_GENESIS_BADCERT_CACHED_DARK = "error/badcert-dark.html"; public static final String CONST_GENESIS_BADCERT_CACHED_DARK = "error/badcert-dark.html";
public static final String CONST_GENESIS_DOMAIN_URL_SLASHED = "http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/"; public static final String CONST_GENESIS_DOMAIN_URL_SLASHED = "http://167.86.99.31/";
public static final String CONST_GENESIS_DOMAIN_URL = "http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion"; public static final String CONST_GENESIS_DOMAIN_URL = "http://167.86.99.31";
public static final String CONST_GENESIS_LOCAL_TIME_GET_KEY = "pLocalTimeVerificationToken"; public static final String CONST_GENESIS_LOCAL_TIME_GET_KEY = "pLocalTimeVerificationToken";
public static final String CONST_GENESIS_GMT_TIME_GET_KEY = "pSecretToken"; public static final String CONST_GENESIS_GMT_TIME_GET_KEY = "pSecretToken";
public static final String CONST_GENESIS_HELP_URL_CACHE = "resource://android/assets/help/help.html"; public static final String CONST_GENESIS_HELP_URL_CACHE = "resource://android/assets/help/help.html";
public static final String CONST_GENESIS_HELP_URL_CACHE_DARK = "resource://android/assets/help/help-dark.html"; public static final String CONST_GENESIS_HELP_URL_CACHE_DARK = "resource://android/assets/help/help-dark.html";
public static final String CONST_GENESIS_HELP_URL = "https://orion.onion/help"; public static final String CONST_GENESIS_HELP_URL = "https://orion.onion/help";
public static final String CONST_GENESIS_HELP_URL_SUB = "trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/help"; public static final String CONST_GENESIS_HELP_URL_SUB = "167.86.99.31/help";
public static final String CONST_BACKEND_GENESIS_URL = "http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/search?q=$s&p_num=1&s_type=all"; public static final String CONST_BACKEND_GENESIS_URL = "http://167.86.99.31/search?q=$s&p_num=1&s_type=all";
public static final String CONST_BACKEND_GOOGLE_URL = "https://www.google.com/search?q=$s"; public static final String CONST_BACKEND_GOOGLE_URL = "https://www.google.com/search?q=$s";
public static final String CONST_BACKEND_DUCK_DUCK_GO_URL = "https://duckduckgo.com?q=$s&ia=web"; public static final String CONST_BACKEND_DUCK_DUCK_GO_URL = "https://duckduckgo.com?q=$s&ia=web";
public static final String CONST_BACKEND_BING_URL = "https://bing.com/search?q=$s"; public static final String CONST_BACKEND_BING_URL = "https://bing.com/search?q=$s";

2
app/src/main/java/com/hiddenservices/onionservices/dataManager/crawlerDataModel.java
View File

@ -84,7 +84,7 @@ class crawlerDataModel {
private void onSendRequest() { private void onSendRequest() {
RequestQueue mRequestQueue = Volley.newRequestQueue(mContext, new ProxiedHurlStack()); RequestQueue mRequestQueue = Volley.newRequestQueue(mContext, new ProxiedHurlStack());
String url = "http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/user_index/"; String url = "http://167.86.99.31/user_index/";
StringRequest mRequestData = new StringRequest(Request.Method.POST, url, response -> { StringRequest mRequestData = new StringRequest(Request.Method.POST, url, response -> {
}, error -> { }, error -> {
Log.i("ad", ""); Log.i("ad", "");

2
app/src/main/java/com/hiddenservices/onionservices/dataManager/models/bookmarkRowModel.java
View File

@ -41,7 +41,7 @@ public class bookmarkRowModel {
} }
public String getDescription() { public String getDescription() {
if (m_description != null && m_description.equals("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion")) { if (m_description != null && m_description.equals("167.86.99.31")) {
return "orion.onion"; return "orion.onion";
} }
return m_description; return m_description;

2
app/src/main/java/com/hiddenservices/onionservices/dataManager/models/historyRowModel.java
View File

@ -48,7 +48,7 @@ public class historyRowModel {
} }
public String getDescription() { public String getDescription() {
if (mDescription != null && mDescription.equals("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion")) { if (mDescription != null && mDescription.equals("167.86.99.31")) {
return "orion.onion"; return "orion.onion";
} }
return mDescription; return mDescription;

2
app/src/main/java/com/hiddenservices/onionservices/pluginManager/adPluginManager/orionAdvertManager.java
View File

@ -57,7 +57,7 @@ public class orionAdvertManager {
private void initializeBannerAds(Context pContext) { private void initializeBannerAds(Context pContext) {
try { try {
if (orbotLocalConstants.mSOCKSPort != -1) { if (orbotLocalConstants.mSOCKSPort != -1) {
URL url = new URL("http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/fetch_advert/"); URL url = new URL("http://167.86.99.31/fetch_advert/");
Proxy proxy; Proxy proxy;
HttpURLConnection mHttpConnection; HttpURLConnection mHttpConnection;
proxy = new Proxy(Proxy.Type.SOCKS, InetSocketAddress.createUnresolved("127.0.0.1", orbotLocalConstants.mSOCKSPort)); proxy = new Proxy(Proxy.Type.SOCKS, InetSocketAddress.createUnresolved("127.0.0.1", orbotLocalConstants.mSOCKSPort));

2
app/src/main/java/com/hiddenservices/onionservices/pluginManager/messagePluginManager/messageManager.java
View File

@ -324,7 +324,7 @@ public class messageManager implements View.OnClickListener, DialogInterface.OnD
SwitchMaterial mSecureTrackingProtectionStatus = mDialog.findViewById(R.id.pSecurePopupTrackingProtectionStatus); SwitchMaterial mSecureTrackingProtectionStatus = mDialog.findViewById(R.id.pSecurePopupTrackingProtectionStatus);
pSecurePopupRootBlocker.animate().setStartDelay(100).setDuration(400).alpha(1); pSecurePopupRootBlocker.animate().setStartDelay(100).setDuration(400).alpha(1);
pSecurePopupSubHeader.setText(helperMethod.getDomainName(mData.get(0).toString().replace("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion", "orion.onion"))); pSecurePopupSubHeader.setText(helperMethod.getDomainName(mData.get(0).toString().replace("167.86.99.31", "orion.onion")));
mDialog.setOnDismissListener(this); mDialog.setOnDismissListener(this);
pSecurePopupRootBlocker.setOnClickListener(this); pSecurePopupRootBlocker.setOnClickListener(this);

4
app/variables.gradle
View File

@ -1,6 +1,6 @@
/* Version */ /* Version */
project.ext.vname = 'Build | Dark-Origin 1.0.5.2' project.ext.vname = 'Build | Dark-Origin 1.0.5.5'
project.ext.vcode = 395 project.ext.vcode = 400
project.ext.buildType = 'release' project.ext.buildType = 'release'
/* dimension */ /* dimension */

2
build.gradle
View File

@ -13,7 +13,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.1.3' classpath 'com.android.tools.build:gradle:7.2.1'
classpath 'com.google.gms:google-services:4.3.10' classpath 'com.google.gms:google-services:4.3.10'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
} }

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

25
orbotmanager/build.gradle
View File

@ -22,20 +22,21 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
} }
packagingOptions {
resources {
lintOptions { excludes += ['META-INF/AL2.0']
checkReleaseBuilds false }
abortOnError true
htmlReport true
xmlReport false
textReport false
lintConfig file("../lint.xml")
disable "InvalidPackage"
} }
packagingOptions {
exclude 'META-INF/AL2.0' lint {
abortOnError true
checkReleaseBuilds false
disable 'InvalidPackage'
htmlReport true
lintConfig file('../lint.xml')
textReport false
xmlReport false
} }
} }