diff --git a/app/build.gradle b/app/build.gradle index 90771f2d..fb963cac 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,27 +44,26 @@ android { productFlavors { /*arm { - versionCode 152 - versionName "152" + versionCode 156 + versionName "156" dimension "abi" buildConfigField "String", "VARIANT", "\"arm\"" - }*/ + } aarch64 { - versionCode 153 - versionName "153" + versionCode 157 + versionName "157" dimension "abi" buildConfigField "String", "VARIANT", "\"aarch64\"" - } - /* + }*/ x86 { - versionCode 154 - versionName "154" + versionCode 158 + versionName "158" dimension "abi" buildConfigField "String", "VARIANT", "\"i686\"" - } - /*x86_64 { - versionCode 155 - versionName "155" + }/* + x86_64 { + versionCode 159 + versionName "159" dimension "abi" buildConfigField "String", "VARIANT", "\"x86_64\"" }*/ @@ -109,10 +108,10 @@ dependencies { implementation 'com.google.android.gms:play-services-ads:17.1.1' implementation "cz.msebera.android:httpclient:4.4.1.2" - //x86Implementation "org.mozilla.geckoview:geckoview-x86:67.0.20190521210220" + x86Implementation "org.mozilla.geckoview:geckoview-x86:67.0.20190521210220" //x86_64Implementation "org.mozilla.geckoview:geckoview-x86_64:67.0.20190521210220" //armImplementation "org.mozilla.geckoview:geckoview-armeabi-v7a:67.0.20190521210220" - aarch64Implementation "org.mozilla.geckoview:geckoview-arm64-v8a:67.0.20190521210220" + //aarch64Implementation "org.mozilla.geckoview:geckoview-arm64-v8a:67.0.20190521210220" implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9' implementation 'com.crowdfire.cfalertdialog:cfalertdialog:1.1.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6ede54c9..5ee71d55 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,7 +27,7 @@ 0 || (realHeight - displayHeight) > 0; } public int getStatusBarHeight(Context c) { @@ -144,6 +176,16 @@ public class application_controller extends AppCompatActivity return result; } + public int getNavigationBarHeight(Context c) { + Resources resources = c.getResources(); + int resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android"); + if (resourceId > 0) { + return resources.getDimensionPixelSize(resourceId); + } + return 0; + } + + public void initializeBackgroundColor() { if (android.os.Build.VERSION.SDK_INT > Build.VERSION_CODES.M){ @@ -219,9 +261,7 @@ public class application_controller extends AppCompatActivity { webRequestHandler.getInstance().initialization(webView1,webView2,progressBar,searchbar, splashScreen,this, requestFailure,this); webView1.bringToFront(); - Log.i("PROBLEM25",""); progressBar.animate().setDuration(150).alpha(0f); - //floatingButton.setAlpha(0); session1 = new GeckoSession(); runtime1 = GeckoRuntime.getDefault(application_controller.this); @@ -237,7 +277,6 @@ public class application_controller extends AppCompatActivity Drawable img = getResources().getDrawable( R.drawable.lock ); searchbar.measure(0, 0); img.setBounds( 0, (int)(searchbar.getMeasuredHeight()*0.00), (int)(searchbar.getMeasuredHeight()*1.10), (int)(searchbar.getMeasuredHeight()*0.69) ); - //img.setBounds( 0, 0, 50, 31 ); searchbar.setCompoundDrawables( img, null, null, null ); } @@ -393,7 +432,7 @@ public class application_controller extends AppCompatActivity super.onPageFinished(view, url); handler = new Handler(); - int delay = 200; + int delay = 150; if(startPage>2) { delay = 0; @@ -423,13 +462,12 @@ public class application_controller extends AppCompatActivity progressBar.animate().setDuration(150).alpha(0f).withEndAction((() -> progressBar.setVisibility(View.INVISIBLE)));; } + splashScreen.animate().alpha(0.0f).setStartDelay(150).setDuration(200).setListener(null).withEndAction((() -> splashScreen.setVisibility(View.GONE))); if(!status.hasApplicationLoaded) { status.hasApplicationLoaded = true; handler = new Handler(); - splashScreen.animate().alpha(0.0f).setStartDelay(100).setDuration(300).setListener(null).withEndAction((() -> splashScreen.setVisibility(View.GONE))); - Handler popuphandler = new Handler(); popuphandler.postDelayed(new Runnable() { @@ -447,7 +485,7 @@ public class application_controller extends AppCompatActivity } } } - }, 2000); + }, 1000); } @@ -917,7 +955,7 @@ class progressDelegate implements GeckoSession.ProgressDelegate } else { - String editedURL = "https://boogle.store/search?q="+v.getText().toString().replaceAll(" ","+")+"&p_num=1&s_type=all"; + String editedURL = "https://boogle.store/search?q="+v.getText().toString().replaceAll(" ","+")+"&p_num=1&s_type=all&savesearch=on"; status.currentURL = editedURL; searchbar.setText(editedURL.replace("boogle.store","genesis.onion")); searchbar.clearFocus(); @@ -927,7 +965,7 @@ class progressDelegate implements GeckoSession.ProgressDelegate } catch (IOException e) { - String editedURL = "https://boogle.store/search?q="+v.getText().toString().replaceAll(" ","+")+"&p_num=1&s_type=all"; + String editedURL = "https://boogle.store/search?q="+v.getText().toString().replaceAll(" ","+")+"&p_num=1&s_type=all&savesearch=on"; status.currentURL = editedURL; searchbar.clearFocus(); searchbar.setText(editedURL.replace("boogle.store","genesis.onion")); diff --git a/app/src/main/java/com/darkweb/genesissearchengine/buildconstants.java b/app/src/main/java/com/darkweb/genesissearchengine/buildconstants.java index d97d1013..e6278387 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/buildconstants.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/buildconstants.java @@ -2,6 +2,6 @@ package com.darkweb.genesissearchengine; public class buildconstants { - //public static String build_type = "playstore"; - public static String build_type = "local"; + public static String build_type = "playstore"; + //public static String build_type = "local"; } diff --git a/app/src/main/java/com/darkweb/genesissearchengine/message_manager.java b/app/src/main/java/com/darkweb/genesissearchengine/message_manager.java index f9482780..2d4676e0 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/message_manager.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/message_manager.java @@ -188,10 +188,10 @@ public class message_manager { { CFAlertDialog.Builder builder = new CFAlertDialog.Builder(application_context) .setDialogStyle(CFAlertDialog.CFAlertStyle.BOTTOM_SHEET) - .setTitle("Initializing Dark Web") + .setTitle("Initializing") .setBackgroundColor(Color.argb(230,33,45,69)) .setTextColor(Color.argb(255,255,255,255)) - .setMessage("Please wait! While we connect you to hidden web. This might take few seconds\n") + .setMessage("Please wait! While we connect you to hidden web. This might take few minutes\n") .addButton("Dismiss", -1, -1, CFAlertDialog.CFAlertActionStyle.POSITIVE, CFAlertDialog.CFAlertActionAlignment.END, (dialog, which) -> { dialog.dismiss(); }); diff --git a/app/src/main/java/com/darkweb/genesissearchengine/webRequestHandler.java b/app/src/main/java/com/darkweb/genesissearchengine/webRequestHandler.java index 5920dc06..212a876e 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/webRequestHandler.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/webRequestHandler.java @@ -41,10 +41,11 @@ public class webRequestHandler private WebView[] view = new WebView[2]; private ProgressBar progressBar; private EditText searchbar; - private FrameLayout requestFailure; + private ConstraintLayout requestFailure; public boolean reloadError=false; public boolean isReloadedUrl = false; + public boolean isHomeCacheUpdated = false; private int viewIndex = 1; private int currentViewIndex = 0; private String html = ""; @@ -69,7 +70,7 @@ public class webRequestHandler { } - public void initialization(WebView view1, WebView view2, ProgressBar progressBar, EditText searchbar, FrameLayout requestFailure, Context applicationContext,ConstraintLayout splash,application_controller controller) + public void initialization(WebView view1, WebView view2, ProgressBar progressBar, EditText searchbar, ConstraintLayout splash, Context applicationContext,ConstraintLayout requestFailure,application_controller controller) { this.applictionContext = applicationContext; this.controller = controller; @@ -184,6 +185,7 @@ public class webRequestHandler Message message = new Message(); message.what = MESSAGE_UPDATE_TEXT_CHILD_THREAD; updateUIHandler.sendMessage(message); + updateHomePageCache(); return; } } @@ -220,7 +222,7 @@ public class webRequestHandler html = str.toString(); if(url.equals("https://boogle.store")) { - html = html.replace("/privacy","https://boogle.store/privacy").replace("/about","https://boogle.store/about").replace("/reportus","https://boogle.store/reportus").replace("/search?q=random&p_num=1&s_type=image","https://boogle.store/search?q=random&p_num=1&s_type=image"); + html = html.replace("/privacy","https://boogle.store/privacy").replace("/about","https://boogle.store/about").replace("/reportus","https://boogle.store/reportus").replace("\"search\"","https://boogle.store/search").replace("/create","https://boogle.store/create"); Log.i("SHITS","fizza3 " + html); helperMethod.setInternalHTML(html,applictionContext); } @@ -368,7 +370,52 @@ public class webRequestHandler } /*****--------------------ASYNC TASK--------------------******/ + public void updateHomePageCache() + { + if(!isHomeCacheUpdated) + { + isHomeCacheUpdated = true; + String url = "https://boogle.store"; + try + { + HttpClient client=new DefaultHttpClient();; + try { + SSLConnectionSocketFactory scsf = new SSLConnectionSocketFactory( + SSLContexts.custom().loadTrustMaterial(null, new TrustSelfSignedStrategy()).build(), + NoopHostnameVerifier.INSTANCE); + client = HttpClients.custom().setSSLSocketFactory(scsf).build(); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } catch (KeyManagementException e) { + e.printStackTrace(); + } catch (KeyStoreException e) { + e.printStackTrace(); + } + + request = new HttpGet(url); + baseURL = url; + HttpResponse response = client.execute(request); + InputStream in = response.getEntity().getContent(); + BufferedReader reader = new BufferedReader(new InputStreamReader(in)); + StringBuilder str = new StringBuilder(); + String line = null; + + while((line = reader.readLine()) != null) + { + str.append(line); + } + in.close(); + + html = str.toString(); + helperMethod.setInternalHTML(html,applictionContext); + } + catch (Exception ex) + { + + } + } + } } diff --git a/app/src/main/res/drawable-v24/backsplash.xml b/app/src/main/res/drawable-v24/backsplash.xml index d4a659c2..9543926e 100644 --- a/app/src/main/res/drawable-v24/backsplash.xml +++ b/app/src/main/res/drawable-v24/backsplash.xml @@ -2,4 +2,9 @@ + + + diff --git a/app/src/main/res/drawable/backsplash.xml b/app/src/main/res/drawable/backsplash.xml index d4a659c2..9543926e 100644 --- a/app/src/main/res/drawable/backsplash.xml +++ b/app/src/main/res/drawable/backsplash.xml @@ -2,4 +2,9 @@ + + + diff --git a/app/src/main/res/drawable/interneticon.png b/app/src/main/res/drawable/interneticon.png index 5a89c082..7b744138 100644 Binary files a/app/src/main/res/drawable/interneticon.png and b/app/src/main/res/drawable/interneticon.png differ diff --git a/app/src/main/res/layout-v26/application_view.xml b/app/src/main/res/layout-v26/application_view.xml index de80ba48..2e5ca0bc 100644 --- a/app/src/main/res/layout-v26/application_view.xml +++ b/app/src/main/res/layout-v26/application_view.xml @@ -87,7 +87,7 @@ app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="10dp" android:layout_marginEnd="10dp" app:layout_constraintEnd_toEndOf="parent"/> - - + android:background="@drawable/backsplash" app:layout_constraintStart_toStartOf="parent" + app:layout_constraintHorizontal_bias="0.5" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent"/> - + android:layout_height="35dp" + app:srcCompat="@drawable/loading" + android:id="@+id/imageView_loading_back" app:layout_constraintStart_toStartOf="parent" + app:layout_constraintHorizontal_bias="0.5" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent"/> + - - + android:background="@drawable/backsplash" app:layout_constraintStart_toStartOf="parent" + app:layout_constraintHorizontal_bias="0.5" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent"/> - + android:layout_height="35dp" + app:srcCompat="@drawable/loading" + android:id="@+id/imageView_loading_back" app:layout_constraintStart_toStartOf="parent" + app:layout_constraintHorizontal_bias="0.5" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent"/> +