diff --git a/app/build.gradle b/app/build.gradle index ac86f569..6cd44add 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -99,7 +99,7 @@ dependencies { implementation 'com.android.support:appcompat-v7:28.0.0' /*Firefox ABI Splits*/ - x86Implementation "org.mozilla.geckoview:geckoview-${geckoviewChannel}:${geckoviewVersion}" + x86Implementation "org.mozilla.geckoview:geckoview-${geckoviewChannel}:${geckoviewVersion}" x86_64Implementation "org.mozilla.geckoview:geckoview-${geckoviewChannel}:${geckoviewVersion}" armImplementation "org.mozilla.geckoview:geckoview-${geckoviewChannel}:${geckoviewVersion}" aarch64Implementation "org.mozilla.geckoview:geckoview-${geckoviewChannel}:${geckoviewVersion}" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6295106f..67dd580f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,6 +18,7 @@ android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> + selectHistory(){ diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/geckoClients.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/geckoClients.java index 98116093..7283aa5e 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/geckoClients.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/geckoClients.java @@ -15,6 +15,7 @@ import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; import com.darkweb.genesissearchengine.constants.*; import com.darkweb.genesissearchengine.dataManager.preference_manager; +import com.darkweb.genesissearchengine.helperMethod; import com.darkweb.genesissearchengine.pluginManager.fabricManager; import com.darkweb.genesissearchengine.pluginManager.localNotification; import com.darkweb.genesissearchengine.pluginManager.message_manager; @@ -27,7 +28,7 @@ import static com.google.ads.AdRequest.LOGTAG; class geckoClients { - private GeckoSession session1 = null; + public GeckoSession session1 = null; private GeckoRuntime runtime1 = null; private final Handler internetErrorHandler = new Handler(); @@ -42,6 +43,7 @@ class geckoClients private int urlRequestCount = 0; private boolean isAppRated = false; + private boolean canAdBeShown = false; geckoClients() { @@ -51,6 +53,8 @@ class geckoClients void loadGeckoURL(String url,GeckoView geckoView,boolean isUrlSavable,boolean reinit) { boolean init_status = orbot_manager.getInstance().initOrbot(url); + canAdBeShown = true; + if (init_status) { if(reinit) @@ -163,9 +167,11 @@ class geckoClients //message_manager.getInstance().rateApp(); } } - else if(isAppRated || 1==1) + else if(helperMethod.getHost(navigatedURL).contains(".onion")) { - if(isFirstTimeLoad && navigatedURL.contains(".onion")) + home_model.getInstance().getHomeInstance().onShowAd(enums.adID.hidden_onion_start); + canAdBeShown = false; + /*if(isFirstTimeLoad && navigatedURL.contains(".onion")) { home_model.getInstance().getHomeInstance().onShowAd(enums.adID.hidden_onion_start); } @@ -176,7 +182,11 @@ class geckoClients else if(!isFirstTimeLoad && !navigatedURL.contains(".onion")) { home_model.getInstance().getHomeInstance().onShowAd(enums.adID.hidden_base); - } + }*/ + } + else + { + canAdBeShown = true; } home_model.getInstance().getHomeInstance().onDisableInternetError(); diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/home_controller.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/home_controller.java index 4c7df472..3b01b503 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/home_controller.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/home_controller.java @@ -1,7 +1,10 @@ package com.darkweb.genesissearchengine.appManager.home_activity; +import android.content.ComponentCallbacks2; +import android.content.Intent; import android.os.Build; import android.os.Bundle; +import android.util.Log; import android.view.*; import android.webkit.*; import android.widget.*; @@ -10,20 +13,22 @@ import androidx.constraintlayout.widget.ConstraintLayout; import com.darkweb.genesissearchengine.*; import com.darkweb.genesissearchengine.constants.constants; import com.darkweb.genesissearchengine.constants.enums; +import com.darkweb.genesissearchengine.constants.keys; import com.darkweb.genesissearchengine.constants.status; import com.darkweb.genesissearchengine.dataManager.preference_manager; import com.darkweb.genesissearchengine.pluginManager.*; import com.example.myapplication.R; import com.google.android.material.floatingactionbutton.FloatingActionButton; +import org.mozilla.geckoview.GeckoSession; import org.mozilla.geckoview.GeckoView; -public class home_controller extends AppCompatActivity +public class home_controller extends AppCompatActivity implements ComponentCallbacks2 { /*View Webviews*/ private WebView webView; - private GeckoView geckoView; + private GeckoView geckoView = null; /*View Objects*/ private ProgressBar progressBar; @@ -58,6 +63,7 @@ public class home_controller extends AppCompatActivity initializeWebView(); initializeLocalEventHandlers(); initAdManager(); + initExitService(); orbot_manager.getInstance().reinitOrbot(); viewController.getInstance().initialization(webView,loadingText,progressBar,searchbar,splashScreen,requestFailure,floatingButton, loadingIcon,splashlogo); @@ -65,12 +71,9 @@ public class home_controller extends AppCompatActivity geckoclient.initialize(geckoView); home_model.getInstance().initialization(); initBoogle(); - - } else { - //initializeCrashlytics(); initializeAppModel(); setContentView(R.layout.invalid_setup_view); message_manager.getInstance().abiError(Build.SUPPORTED_ABIS[0]); @@ -78,9 +81,41 @@ public class home_controller extends AppCompatActivity } + public void initExitService() + { + startService(new Intent(getBaseContext(), exitManager.class)); + } + + public void lowMemoryError() + { + viewController.getInstance().lowMemoryError(); + } + public void initAdManager() { - admanager.getInstance().initialize(); + } + + @Override + public void onTrimMemory(int level) + { + if(level==80) + { + preference_manager.getInstance().setBool(keys.low_memory,true); + finish(); + } + } + + @Override + public void onResume() + { + lowMemoryError(); + super.onResume(); + } + + @Override + public void onPause() + { + super.onPause(); } public void initBoogle() diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/home_ehandler.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/home_ehandler.java index 45b0d483..bd31e4f5 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/home_ehandler.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/home_ehandler.java @@ -159,6 +159,10 @@ public class home_ehandler { helperMethod.openDownloadFolder(); } + else if (menuId == R.id.menu9) + { + helperMethod.openActivity(setting_controller.class,constants.list_history); + } } @@ -170,8 +174,8 @@ public class home_ehandler if(status.search_status.equals("Google")) { - preference_manager.getInstance().setString(keys.search_engine,"Darkweb"); - status.search_status = "Darkweb"; + preference_manager.getInstance().setString(keys.search_engine,"Hidden Web"); + status.search_status = "Hidden Web"; home_model.getInstance().getHomeInstance().initSearchEngine(); } else diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/home_model.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/home_model.java index f597ac1a..5ec8d018 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/home_model.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/home_model.java @@ -76,7 +76,7 @@ public class home_model } else { - database_controller.getInstance().execSQL("delete from history where 1"); + database_controller.getInstance().execSQL("delete from history where 1",null); } home_model.getInstance().getHomeInstance().reInitializeSuggestion(); } @@ -84,7 +84,7 @@ public class home_model if(history.size()> constants.max_history_size) { - database_controller.getInstance().execSQL("delete from history where id="+history.get(history.size()-1).getId()); + database_controller.getInstance().execSQL("delete from history where id="+history.get(history.size()-1).getId(),null); history.remove(history.size()-1); } @@ -97,7 +97,11 @@ public class home_model addSuggestions(url); SimpleDateFormat d_form = new SimpleDateFormat("dd MMMM | hh:mm a"); String date = d_form.format(new Date()); - database_controller.getInstance().execSQL("INSERT INTO history(id,date,url) VALUES("+autoval+",'"+date+"','"+url+"');"); + + String[] params = new String[1]; + params[0] = url; + + database_controller.getInstance().execSQL("INSERT INTO history(id,date,url) VALUES("+autoval+",'"+date+"',?);",params); history.add(0,new list_row_model(url,date,autoval)); } public ArrayList getHistory() { @@ -105,14 +109,14 @@ public class home_model } - public void initializeBookmarks(){ + private void initializeBookmarks(){ bookmarks = database_controller.getInstance().selectBookmark(); } public void addBookmark(String url,String title){ int autoval = 0; if(bookmarks.size()> constants.max_bookmark_size) { - database_controller.getInstance().execSQL("delete from bookmark where id="+bookmarks.get(bookmarks.size()-1).getId()); + database_controller.getInstance().execSQL("delete from bookmark where id="+bookmarks.get(bookmarks.size()-1).getId(),null); bookmarks.remove(history.size()-1); } @@ -125,7 +129,12 @@ public class home_model { title = "New_Bookmark"+autoval; } - database_controller.getInstance().execSQL("INSERT INTO bookmark(id,title,url) VALUES("+autoval+",'"+title+"','"+url+"');"); + + String[] params = new String[2]; + params[0] = title; + params[1] = url; + + database_controller.getInstance().execSQL("INSERT INTO bookmark(id,title,url) VALUES("+autoval+",?,?);",params); bookmarks.add(0,new list_row_model(url,title,autoval)); } public ArrayList getBookmark(){ diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/viewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/viewController.java index 1e4e6fa5..a789d1c3 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/viewController.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/viewController.java @@ -462,7 +462,7 @@ public class viewController if(status.search_status.equals("Google")) { - item.setTitle("Switch | Secure Darkweb"); + item.setTitle("Switch | Secure Hidden Web"); } else { @@ -491,4 +491,13 @@ public class viewController return searchbar.getText().toString(); } + public void lowMemoryError() + { + if(preference_manager.getInstance().getBool(keys.low_memory,false)) + { + preference_manager.getInstance().setBool(keys.low_memory,false); + helperMethod.showToast("App Closed Due To Low Memory"); + } + } + } \ No newline at end of file diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/webviewClient.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/webviewClient.java index 7c3828c7..4bbb62ee 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/webviewClient.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/webviewClient.java @@ -46,6 +46,29 @@ public class webviewClient } else { + /* if(url.startsWith("https://boogle.store/search?")) + { + url = url.replace("https://boogle.store/search?q=random&p_num=1&s_type=image","https://duckduckgo.com/?q=onion+links+websites&iar=images&iax=images&ia=images"); + url = url.replace("boogle.store/search?","duckduckgo.com/?"); + url = url.replace("q=","q=onion+links+"); + url = url.replace("&s_type=image","&ia=images&iax=images"); + + home_model.getInstance().getHomeInstance().stopHiddenView(false,false); + fabricManager.getInstance().sendEvent("BASE SIMPLE SEARCHED : " + url); + isGeckoView = true; + if(orbot_manager.getInstance().initOrbot(url)) + { + home_model.getInstance().getHomeInstance().onloadURL(url,true,true); + } + return true; + } + else + { + home_model.getInstance().addNavigation(url,enums.navigationType.base); + home_model.getInstance().addHistory(url); + fabricManager.getInstance().sendEvent("BASE ONION SEARCHED : " + url); + home_model.getInstance().getHomeInstance().onRequestTriggered(false,url); + } */ home_model.getInstance().addNavigation(url,enums.navigationType.base); home_model.getInstance().addHistory(url); fabricManager.getInstance().sendEvent("BASE ONION SEARCHED : " + url); diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/list_manager/list_model.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/list_manager/list_model.java index a95121eb..1f12cc1f 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/list_manager/list_model.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/list_manager/list_model.java @@ -101,7 +101,7 @@ public class list_model { table = strings.history_text; } - database_controller.getInstance().execSQL("delete from "+table+" where id="+index); + database_controller.getInstance().execSQL("delete from "+table+" where id="+index,null); } diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/list_manager/list_view_controller.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/list_manager/list_view_controller.java index 7e4b412a..e4c181be 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/list_manager/list_view_controller.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/list_manager/list_view_controller.java @@ -56,7 +56,7 @@ class list_view_controller { table = strings.history_text; } - database_controller.getInstance().execSQL("delete from "+table+" where 1"); + database_controller.getInstance().execSQL("delete from "+table+" where 1",null); list_model.getInstance().getListInstance().initializeList(); } diff --git a/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java b/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java index b4ed12b1..5165d60a 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java @@ -9,6 +9,7 @@ public class keys /*Home page*/ public static String homepage_html_key = "internalhtml"; + public static String low_memory = "low_memory"; /*Proxy Manager*/ diff --git a/app/src/main/java/com/darkweb/genesissearchengine/constants/status.java b/app/src/main/java/com/darkweb/genesissearchengine/constants/status.java index f74fa627..4f57a632 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/constants/status.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/status.java @@ -22,7 +22,7 @@ public class status { status.java_status = preference_manager.getInstance().getBool(keys.java_script,true); status.history_status = preference_manager.getInstance().getBool(keys.history_clear,true); - status.search_status = preference_manager.getInstance().getString(keys.search_engine,"Darkweb"); + status.search_status = preference_manager.getInstance().getString(keys.search_engine,"Hidden Web"); } } diff --git a/app/src/main/java/com/darkweb/genesissearchengine/constants/strings.java b/app/src/main/java/com/darkweb/genesissearchengine/constants/strings.java index 6ffe55f1..6fb3b8d5 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/constants/strings.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/strings.java @@ -69,7 +69,7 @@ public class strings /*Text Manager*/ - public static String darkweb = "Darkweb"; + public static String darkweb = "Hidden Web"; public static String emptyStr = ""; public static String bookmark_text = "bookmark"; public static String history_text = "history"; diff --git a/app/src/main/java/com/darkweb/genesissearchengine/helperMethod.java b/app/src/main/java/com/darkweb/genesissearchengine/helperMethod.java index 826ebf94..b237ba16 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/helperMethod.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/helperMethod.java @@ -16,6 +16,7 @@ import android.view.WindowManager; import android.view.animation.Animation; import android.view.animation.RotateAnimation; import android.view.inputmethod.InputMethodManager; +import android.widget.Toast; import androidx.core.app.ShareCompat; import com.darkweb.genesissearchengine.appManager.home_activity.home_model; import com.darkweb.genesissearchengine.constants.keys; @@ -174,4 +175,9 @@ public class helperMethod intent.setData(Uri.parse("market://details?id="+packageName)); home_model.getInstance().getHomeInstance().startActivity(intent); } + + public static void showToast(String messaage) + { + Toast.makeText(home_model.getInstance().getHomeInstance().getApplicationContext(),messaage,Toast.LENGTH_SHORT).show(); + } } diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/admanager.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/admanager.java index be524679..9fc299e2 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/admanager.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/admanager.java @@ -2,7 +2,9 @@ package com.darkweb.genesissearchengine.pluginManager; import com.darkweb.genesissearchengine.appManager.home_activity.home_model; import com.darkweb.genesissearchengine.constants.enums; +import com.example.myapplication.R; import com.google.android.gms.ads.AdRequest; +import com.google.android.gms.ads.AdView; import com.google.android.gms.ads.InterstitialAd; import com.google.android.gms.ads.MobileAds; @@ -16,6 +18,7 @@ public class admanager private InterstitialAd mInterstitialHidden_base; private int adCount = 0; boolean isAdShown = false; + private AdView bannerAds = null; /*Initializations*/ @@ -30,19 +33,29 @@ public class admanager { MobileAds.initialize(home_model.getInstance().getHomeInstance(), "ca-app-pub-5074525529134731~2926711128"); mInterstitialHidden_base = initAd("ca-app-pub-5074525529134731/1637043432"); - //mInterstitialHidden_onion = initAd("ca-app-pub-5074525529134731/4332539288"); - //mInterstitialInternal = initAd("ca-app-pub-5074525529134731/8478420705"); + // initBannerAds(); + // mInterstitialHidden_onion = initAd("ca-app-pub-5074525529134731/4332539288"); + // mInterstitialInternal = initAd("ca-app-pub-5074525529134731/8478420705"); } public InterstitialAd initAd(String id) { InterstitialAd adInstance = new InterstitialAd(home_model.getInstance().getHomeInstance()); adInstance.setAdUnitId(id); - adInstance.loadAd(new AdRequest.Builder().build()); + adInstance.loadAd(new AdRequest.Builder().addTestDevice("5AAFC2DFAE5C3906292EB576F0822FD7").build()); return adInstance; } + private void initBannerAds() + { + // bannerAds = home_model.getInstance().getHomeInstance().findViewById(R.id.adView); + // AdRequest request = new AdRequest.Builder() + // .addTestDevice("5AAFC2DFAE5C3906292EB576F0822FD7") + // .build(); + // bannerAds.loadAd(request ); + } + /*Helper Methods*/ public void showAd(enums.adID id) @@ -50,7 +63,7 @@ public class admanager if(id.equals(enums.adID.hidden_onion_start)) { mInterstitialHidden_base.show(); - mInterstitialHidden_base.loadAd(new AdRequest.Builder().build()); + mInterstitialHidden_base.loadAd(new AdRequest.Builder().addTestDevice("5AAFC2DFAE5C3906292EB576F0822FD7").build()); } /*else if(id.equals(enums.adID.hidden_onion)) { diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/exitManager.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/exitManager.java new file mode 100644 index 00000000..da6de3b1 --- /dev/null +++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/exitManager.java @@ -0,0 +1,32 @@ +package com.darkweb.genesissearchengine.pluginManager; + +import android.app.Service; +import android.content.Intent; +import android.os.IBinder; +import com.darkweb.genesissearchengine.constants.keys; +import com.darkweb.genesissearchengine.dataManager.preference_manager; + +public class exitManager extends Service { + + @Override + public IBinder onBind(Intent intent) { + return null; + } + + @Override + public int onStartCommand(Intent intent, int flags, int startId) { + return START_NOT_STICKY; + } + + @Override + public void onDestroy() { + super.onDestroy(); + preference_manager.getInstance().setBool(keys.low_memory,false); + } + + @Override + public void onTaskRemoved(Intent rootIntent) { + stopSelf(); + preference_manager.getInstance().setBool(keys.low_memory,false); + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/home_view.xml b/app/src/main/res/layout/home_view.xml index cf076181..c15d680b 100644 --- a/app/src/main/res/layout/home_view.xml +++ b/app/src/main/res/layout/home_view.xml @@ -252,7 +252,4 @@ app:layout_constraintEnd_toEndOf="parent" android:layout_marginBottom="24dp" android:layout_marginEnd="24dp"/> - - - \ No newline at end of file diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index d4dd4c9c..66d298b7 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -8,6 +8,10 @@ android:title="Switch | Secure Google" app:showAsAction="always" android:icon="@android:drawable/btn_star"/> + Clear - Darkweb + Hidden Web Google Bing diff --git a/app/variables.gradle b/app/variables.gradle index 4d0c689b..dd16c429 100644 --- a/app/variables.gradle +++ b/app/variables.gradle @@ -1,24 +1,24 @@ /*arm versions*/ - project.ext.arm_vname = '205' - project.ext.arm_vcode = 205 + project.ext.arm_vname = '225' + project.ext.arm_vcode = 225 /*aarch versions*/ - project.ext.aarch_vname = '206' - project.ext.aarch_vcode = 206 + project.ext.aarch_vname = '226' + project.ext.aarch_vcode = 226 /*x86 versions*/ - project.ext.x86_vname = '207' - project.ext.x86_vcode = 207 + project.ext.x86_vname = '227' + project.ext.x86_vcode = 227 /*x64 versions*/ - project.ext.x64_vname = '208' - project.ext.x64_vcode = 208 + project.ext.x64_vname = '228' + project.ext.x64_vcode = 228 /*dimension*/ project.ext.dimen = 'abi' /*firefox version*/ - project.ext.firefox_version = "70.0.20190809215748" + project.ext.firefox_version = "70.0.20190814094216" project.ext.firefox_channel = "nightly" /*Application Preferences*/