Bug Fixes

Bug Fixes

.idea/gradle.xml

@@ -22,13 +22,13 @@
             <option value="$PROJECT_DIR$/chromiumTabs" />
             <option value="$PROJECT_DIR$/httpclient" />
             <option value="$PROJECT_DIR$/intentintegrator" />
-            <option value="$PROJECT_DIR$/orbotservicemanager" />
+            <option value="$PROJECT_DIR$/orbotmanager" />
+            <option value="$PROJECT_DIR$/orbotservicemanagers" />
             <option value="$PROJECT_DIR$/shutterbug" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
-    <option name="offlineMode" value="true" />
   </component>
 </project>

app/aarch64/release/output-metadata.json

@@ -5,7 +5,7 @@
     "kind": "Directory"
   },
   "applicationId": "com.darkweb.genesissearchengine",
-  "variantName": "processAarch64ReleaseResources",
+  "variantName": "aarch64Release",
   "elements": [
     {
       "type": "ONE_OF_MANY",

app/build.gradle

@@ -143,7 +143,7 @@ dependencies {
 
     /* Orbot Service */
 
-    implementation project(path: ':orbotservicemanager')
+    implementation project(path: ':orbotmanager')
 
     /* Helper Libraries */
 

app/src/main/java/com/darkweb/genesissearchengine/appManager/helpManager/helpController.java

@@ -228,8 +228,10 @@ public class helpController extends AppCompatActivity {
         }
 
         if(status.sTheme == enums.Theme.THEME_LIGHT || helperMethod.isDayMode(this)){
+            activityContextManager.getInstance().getHomeController().onDisableAdvert();
             activityContextManager.getInstance().getHomeController().onLoadURL(constants.CONST_GENESIS_HELP_URL_CACHE);
         }else {
+            activityContextManager.getInstance().getHomeController().onDisableAdvert();
             activityContextManager.getInstance().getHomeController().onLoadURL(constants.CONST_GENESIS_HELP_URL_CACHE_DARK);
         }
         finish();

app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoClients.java

@@ -466,7 +466,7 @@ public class geckoClients
                 if(e_type.equals(enums.etype.SESSION_ID)){
                     return mSession.getSessionID();
                 }
-                else if (mSessionID!=null && mSessionID.equals(data.get(1)) || e_type.equals(enums.etype.FINDER_RESULT_CALLBACK) || e_type.equals(enums.etype.ON_UPDATE_TAB_TITLE) || e_type.equals(enums.etype.on_update_favicon) ||e_type.equals(enums.etype.on_update_history) || e_type.equals(enums.etype.on_request_completed) || e_type.equals(enums.etype.on_update_suggestion) || e_type.equals(enums.etype.on_update_suggestion_url))
+                else if (mSessionID!=null && mSessionID.equals(data.get(1)) || e_type.equals(enums.etype.M_RATE_COUNT) || e_type.equals(enums.etype.FINDER_RESULT_CALLBACK) || e_type.equals(enums.etype.ON_UPDATE_TAB_TITLE) || e_type.equals(enums.etype.on_update_favicon) ||e_type.equals(enums.etype.on_update_history) || e_type.equals(enums.etype.on_request_completed) || e_type.equals(enums.etype.on_update_suggestion) || e_type.equals(enums.etype.on_update_suggestion_url))
                 {
                     if (e_type.equals(on_handle_external_intent))
                     {

app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoSession.java

@@ -32,8 +32,10 @@ import androidx.core.content.FileProvider;
 import com.darkweb.genesissearchengine.appManager.activityContextManager;
 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.constants.strings;
+import com.darkweb.genesissearchengine.dataManager.dataController;
 import com.darkweb.genesissearchengine.dataManager.dataEnums;
 import com.darkweb.genesissearchengine.helperManager.JavaScriptInterface;
 import com.darkweb.genesissearchengine.helperManager.downloadFileService;
@@ -67,6 +69,7 @@ import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_
 import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_HELP_URL_CACHE_DARK;
 import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_URL_CACHED;
 import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_URL_CACHED_DARK;
+import static com.darkweb.genesissearchengine.constants.enums.etype.M_RATE_COUNT;
 import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.M_LONG_PRESS_URL;
 import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.M_LONG_PRESS_WITH_LINK;
 import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManagerCallbacks.M_RATE_APPLICATION;
@@ -1020,10 +1023,11 @@ public class geckoSession extends GeckoSession implements GeckoSession.MediaDele
     }
 
     private void checkApplicationRate(){
-        if(rateCount==7){
+        if(status.sRateCount==40){
             event.invokeObserver(Arrays.asList(mCurrentURL,mSessionID,mCurrentTitle, mTheme), M_RATE_APPLICATION);
         }
-        rateCount+=1;
+        status.sRateCount+=1;
+        event.invokeObserver(Arrays.asList(mCurrentURL,mSessionID,mCurrentTitle, mTheme), M_RATE_COUNT);
     }
 
 }

app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeController.java

@@ -2,9 +2,7 @@ package com.darkweb.genesissearchengine.appManager.homeManager.homeController;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.app.AlarmManager;
 import android.app.DownloadManager;
-import android.app.PendingIntent;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.ComponentCallbacks2;
@@ -81,11 +79,9 @@ import com.darkweb.genesissearchengine.pluginManager.pluginEnums;
 import com.darkweb.genesissearchengine.widget.progressBar.AnimatedProgressBar;
 import com.example.myapplication.R;
 import com.google.android.gms.ads.AdView;
-
 import org.mozilla.geckoview.ContentBlocking;
 import org.mozilla.geckoview.GeckoResult;
 import org.mozilla.geckoview.GeckoSession;
-import org.mozilla.geckoview.GeckoView;
 import org.torproject.android.proxy.OrbotService;
 import org.torproject.android.proxy.util.Prefs;
 import org.torproject.android.service.wrapper.LocaleHelper;
@@ -100,7 +96,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.concurrent.Callable;
-
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_HELP_URL_CACHE;
 import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_HELP_URL_CACHE_DARK;
@@ -111,7 +106,6 @@ import static com.darkweb.genesissearchengine.constants.enums.etype.M_INITIALIZE
 import static com.darkweb.genesissearchengine.constants.enums.etype.M_INITIALIZE_TAB_SINGLE;
 import static com.darkweb.genesissearchengine.constants.enums.etype.M_NEW_LINK_IN_NEW_TAB;
 import static com.darkweb.genesissearchengine.constants.enums.etype.open_new_tab;
-import static com.darkweb.genesissearchengine.constants.enums.etype.reload;
 import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.*;
 import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManagerCallbacks.M_RATE_APPLICATION;
 import static java.lang.Character.isLetter;
@@ -566,7 +560,6 @@ public class homeController extends AppCompatActivity implements ComponentCallba
     }
 
     public void onLoadURL(String url){
-        status.sUIInteracted = true;
         if(mGeckoView.getSession()!=null && !mGeckoView.getSession().isOpen()){
             mGeckoView.getSession().open(mGeckoClient.getmRuntime());
         }
@@ -827,18 +820,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             if (event.getAction() == MotionEvent.ACTION_DOWN){
                 mGatewaySplash.setElevation(9);
                 status.sUIInteracted = true;
-            }
+                mHomeViewController.onUpdateFindBar(false);
-            else if (event.getAction() == MotionEvent.ACTION_UP){
-                int[] location = new int[2];
-                mTopLayout.getLocationOnScreen(location);
-                int y = location[1];
-                if(status.sFullScreenBrowsing){
-                    if(y<=-helperMethod.pxFromDp(6)){
-                        //mAppBar.setExpanded(false,true);
-                    }else {
-                        //mAppBar.setExpanded(true,true);
-                    }
-                }
             }
 
             return false;
@@ -1143,7 +1125,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         new Handler().postDelayed(() ->
         {
             dataController.getInstance().invokeTab(dataEnums.eTabCommands.M_UPDATE_PIXEL, Arrays.asList(mGeckoClient.getSession().getSessionID(), mRenderedBitmap, null, mGeckoView, false));
-            if(status.sSettingSearchStatus.startsWith("https://boogle.store") || !status.sOpenURLInNewTab){
+            if(status.sSettingSearchStatus.startsWith("https://boogle.store") || !status.sOpenURLInNewTab || mGeckoClient.getSession().getCurrentURL().equals("about:blank") || mGeckoClient.getSession().getCurrentURL().contains("boogle.store") || 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));
             }
 
@@ -1167,7 +1149,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
     }
 
     public void onNewTabBackground(boolean isKeyboardOpenedTemp, boolean isKeyboardOpened){
-        if(status.sSettingSearchStatus.startsWith("https://boogle.store") || !status.sOpenURLInNewTab){
+        if(status.sSettingSearchStatus.startsWith("https://boogle.store") || !status.sOpenURLInNewTab || mGeckoClient.getSession().getCurrentURL().equals("about:blank") || mGeckoClient.getSession().getCurrentURL().contains("boogle.store") || 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));
         }
 
@@ -1196,7 +1178,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         handler.postDelayed(() -> {
             onGetThumbnail(null, false);
             mHomeViewController.expandTopBar(false,mGeckoView.getMaxY());
-            if(status.sSettingSearchStatus.startsWith("https://boogle.store") || !status.sOpenURLInNewTab){
+            if(status.sSettingSearchStatus.startsWith("https://boogle.store") || !status.sOpenURLInNewTab || mGeckoClient.getSession().getCurrentURL().equals("about:blank") || mGeckoClient.getSession().getCurrentURL().contains("boogle.store") || 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.onNewTabAnimation(Collections.singletonList(url), M_INITIALIZE_TAB_LINK);
@@ -1240,6 +1222,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
     }
 
     public void onOpenMenuItem(View view){
+        status.sUIInteracted = true;
         pluginController.getInstance().onMessageManagerInvoke(null, M_RESET);
         initLocalLanguage();
 
@@ -1397,8 +1380,11 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         pluginController.getInstance().onMessageManagerInvoke(null, M_RESET);
         pluginController.getInstance().onNotificationInvoke(Collections.singletonList(1296000000)  , pluginEnums.eNotificationManager.M_CREATE_NOTIFICATION);
         mSearchBarWasBackButtonPressed = false;
+        if(status.sSettingIsAppStarted){
             status.sUIInteracted = true;
         }
+        mHomeViewController.onUpdateFindBar(false);
+    }
 
     @Override
     public void onResume()
@@ -2134,6 +2120,10 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         }
     }
 
+    public void onDisableAdvert(){
+        mHomeViewController.updateBannerAdvertStatus(false, true);
+    }
+
     public void onClearSettings(){
         mHomeViewController.updateBannerAdvertStatus(false, true);
         dataController.getInstance().invokeTab(dataEnums.eTabCommands.M_CLEAR_TAB, null);
@@ -2321,6 +2311,9 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             else if(e_type.equals(enums.etype.M_INIT_PADDING)){
                 mHomeViewController.initTopBarPadding();
             }
+            else if(e_type.equals(enums.etype.M_RATE_COUNT)){
+                dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_INT, Arrays.asList(keys.SETTING_RATE_COUNT, status.sRateCount));
+            }
 
             return null;
         }

app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeViewController.java

@@ -495,7 +495,7 @@ class homeViewController
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             animatedColor oneToTwo = new animatedColor(ContextCompat.getColor(mContext, R.color.landing_ease_blue), ContextCompat.getColor(mContext, R.color.green_dark_v2));
 
-            int mDelay = 1150;
+            int mDelay = 1350;
             if(status.mThemeApplying || mInstant){
                 mDelay = 0;
             }
@@ -654,7 +654,7 @@ class homeViewController
                 mGeckoView.requestFocus();
                 mProgressBarIndeterminate.animate().cancel();
                 mProgressBarIndeterminate.animate().setStartDelay(750).setDuration(250).alpha(0).withEndAction(() -> {
-                    mSplashScreen.animate().setDuration(250).setStartDelay(100).alpha(0).withEndAction(() -> {
+                    mSplashScreen.animate().setDuration(250).setStartDelay(300).alpha(0).withEndAction(() -> {
                         mProgressBarIndeterminate.setVisibility(View.GONE);
                         mSplashScreen.setClickable(false);
                         mSplashScreen.setFocusable(false);
@@ -1090,7 +1090,8 @@ class homeViewController
         mFindBar.animate().cancel();
         if(pStatus){
             mFindBar.setVisibility(View.VISIBLE);
-            mFindBar.setAlpha(1);
+            mFindBar.setAlpha(0);
+            mFindBar.animate().setDuration(200).alpha(1);
             mFindText.requestFocus();
             mFindCount.setText("0/0");
             mFindCount.setTextColor(ContextCompat.getColor(mContext, R.color.c_text_v6));
@@ -1103,7 +1104,7 @@ class homeViewController
         }else {
             mFindText.clearFocus();
             helperMethod.hideKeyboard(mContext);
-            mFindBar.animate().alpha(0).withEndAction(() -> {
+            mFindBar.animate().setDuration(200).alpha(0).withEndAction(() -> {
                 mFindCount.setText(strings.GENERIC_EMPTY_STR);
                 mFindText.setText(strings.GENERIC_EMPTY_STR);
                 mFindBar.setVisibility(View.GONE);

app/src/main/java/com/darkweb/genesissearchengine/constants/enums.java

@@ -4,7 +4,7 @@ public class enums
 {
     /*Settings Manager*/
     public enum etype{
-        M_CHANGE_HOME_THEME, on_update_favicon,M_RELOAD,ON_UPDATE_TAB_TITLE, ON_OPEN_TAB_VIEW,ON_NEW_TAB_ANIMATION, M_UPDATE_SESSION_STATE,ON_LOAD_REQUEST, GECKO_SCROLL_UP, GECKO_SCROLL_UP_ALWAYS, GECKO_SCROLL_DOWN, GECKO_SCROLL_DOWN_CALLER,ON_UPDATE_SEARCH_BAR,M_ON_MAIL,SESSION_ID,M_UPDATE_PIXEL_BACKGROUND, M_INIT_PADDING,M_CACHE_UPDATE_TAB,
+        M_CHANGE_HOME_THEME, on_update_favicon,M_RELOAD,ON_UPDATE_TAB_TITLE, ON_OPEN_TAB_VIEW,ON_NEW_TAB_ANIMATION, M_UPDATE_SESSION_STATE,ON_LOAD_REQUEST, GECKO_SCROLL_UP, GECKO_SCROLL_UP_ALWAYS, GECKO_SCROLL_DOWN, GECKO_SCROLL_DOWN_CALLER,ON_UPDATE_SEARCH_BAR,M_ON_MAIL,SESSION_ID,M_UPDATE_PIXEL_BACKGROUND, M_INIT_PADDING, M_RATE_COUNT,M_CACHE_UPDATE_TAB,
         on_verify_selected_url_menu,FINDER_RESULT_CALLBACK,M_ADMOB_BANNER_RECHECK,M_OPEN_SESSION,M_DOWNLOAD_FAILURE,
         welcome, reload,download_folder, M_UPDATE_THEME,M_ON_BANNER_UPDATE, M_LOAD_HOMEPAGE_GENESIS,M_INIT_TAB_COUNT_FORCED,M_SPLASH_DISABLE,M_NEW_LINK_IN_NEW_TAB,M_RESET_SUGGESTION,
         url_triggered, url_triggered_new_tab,url_clear,fetch_favicon,url_clear_at,remove_from_database,is_empty,M_HOME_PAGE,M_PRELOAD_URL,ON_KEYBOARD_CLOSE,M_CLOSE_TAB,

app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java

@@ -45,6 +45,7 @@ public class keys
     public static final String SETTING_ZOOM = "SETTING_ZOOM_V1";
     public static final String SETTING_VOICE_INPUT = "SETTING_VOICE_INPUT_V1";
     public static final String SETTING_TRACKING_PROTECTION = "SETTING_TRACKING_PROTECTION_V1";
+    public static final String SETTING_RATE_COUNT = "SETTING_RATE_COUNT_V1";
     public static final String SETTING_DONOT_TRACK = "SETTING_DONOT_TRACK_V1";
     public static final String SETTING_RESTORE_TAB = "SETTING_RESTORE_TAB_V1";
     public static final String SETTING_CHARACTER_ENCODING = "SETTING_CHARACTER_ENCODING_V1";

app/src/main/java/com/darkweb/genesissearchengine/constants/status.java

@@ -73,6 +73,7 @@ public class status
     public static int sWidgetResponse = enums.WidgetResponse.NONE;
     public static int sBridgeNotificationManual = 0;
     public static int sSettingTrackingProtection = 0;
+    public static int sRateCount = 0;
 
     public static float sSettingFontSize = 1;
 
@@ -128,6 +129,7 @@ public class status
         status.sOpenURLInNewTab = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.SETTING_OPEN_URL_IN_NEW_TAB,true));
         status.sLogListView = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.SETTING_LIST_VIEW,true));
         status.sTabGridLayoutEnabled = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.SETTING_SHOW_TAB_GRID,true));
+        status.sRateCount = (int)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_INT, Arrays.asList(keys.SETTING_RATE_COUNT, 0));
     }
 
 }

app/src/main/java/com/darkweb/genesissearchengine/helperManager/helperMethod.java

@@ -681,7 +681,9 @@ public class helperMethod
     }
 
     public static void openFile(File url, Context context) {
+        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1){
             try {
+
                 Uri uri = FileProvider.getUriForFile(context, context.getApplicationContext().getPackageName() + ".provider", url);
                 Intent intent = new Intent(Intent.ACTION_VIEW,Uri.parse(url.toString()));
                 intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
@@ -689,6 +691,9 @@ public class helperMethod
                 intent.setDataAndType(uri, Uri.parse(url.toString()).getScheme());
                 context.startActivity(intent);
             } catch (ActivityNotFoundException e) {
+                Toast.makeText(context, "No application found which can open the file", Toast.LENGTH_SHORT).show();
+            }
+        } else{
             try {
                 Uri uri = FileProvider.getUriForFile(context, context.getApplicationContext().getPackageName() + ".provider", url);
                 Intent intent = new Intent(Intent.ACTION_VIEW,Uri.parse(url.toString()));

app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messageManager.java

@@ -144,11 +144,11 @@ class messageManager
                 catch (Exception ex)
                 {
                     onTrigger(Arrays.asList(mContext, mContext.getString(R.string.ALERT_NOT_SUPPORTED_MESSAGE)),M_NOT_SUPPORTED);
+                    onClearReference();
                 }
             };
             handler.postDelayed(runnable, 1000);
         });
-        mDialog.setOnDismissListener(dialog -> onClearReference());
     }
 
     private void reportedSuccessfully()
@@ -408,7 +408,9 @@ class messageManager
         mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss());
         mDialog.findViewById(R.id.pNext).setOnClickListener(v -> {
             ArrayList<Object> tempData = new ArrayList<>();
+            if(mData!=null){
                 tempData.addAll(mData);
+            }
             mDialog.dismiss();
             final Handler handler = new Handler();
             Runnable runnable = () -> mEvent.invokeObserver(tempData, M_DOWNLOAD_SINGLE);
@@ -576,7 +578,9 @@ class messageManager
 
     void onTrigger(List<Object> pData, pluginEnums.eMessageManager pEventType)
     {
+        if(!pEventType.equals(M_RATE_FAILURE) && !pEventType.equals(M_RATE_SUCCESS) && !pEventType.equals(M_NOT_SUPPORTED)){
             onClearReference();
+        }
         if(pEventType.equals(pluginEnums.eMessageManager.M_RESET)){
             onReset();
         }

app/src/main/res/custom-xml/images/xml/ic_baseline_fingerprint.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M17.81,4.47c-0.08,0 -0.16,-0.02 -0.23,-0.06C15.66,3.42 14,3 12.01,3c-1.98,0 -3.86,0.47 -5.57,1.41 -0.24,0.13 -0.54,0.04 -0.68,-0.2 -0.13,-0.24 -0.04,-0.55 0.2,-0.68C7.82,2.52 9.86,2 12.01,2c2.13,0 3.99,0.47 6.03,1.52 0.25,0.13 0.34,0.43 0.21,0.67 -0.09,0.18 -0.26,0.28 -0.44,0.28zM3.5,9.72c-0.1,0 -0.2,-0.03 -0.29,-0.09 -0.23,-0.16 -0.28,-0.47 -0.12,-0.7 0.99,-1.4 2.25,-2.5 3.75,-3.27C9.98,4.04 14,4.03 17.15,5.65c1.5,0.77 2.76,1.86 3.75,3.25 0.16,0.22 0.11,0.54 -0.12,0.7 -0.23,0.16 -0.54,0.11 -0.7,-0.12 -0.9,-1.26 -2.04,-2.25 -3.39,-2.94 -2.87,-1.47 -6.54,-1.47 -9.4,0.01 -1.36,0.7 -2.5,1.7 -3.4,2.96 -0.08,0.14 -0.23,0.21 -0.39,0.21zM9.75,21.79c-0.13,0 -0.26,-0.05 -0.35,-0.15 -0.87,-0.87 -1.34,-1.43 -2.01,-2.64 -0.69,-1.23 -1.05,-2.73 -1.05,-4.34 0,-2.97 2.54,-5.39 5.66,-5.39s5.66,2.42 5.66,5.39c0,0.28 -0.22,0.5 -0.5,0.5s-0.5,-0.22 -0.5,-0.5c0,-2.42 -2.09,-4.39 -4.66,-4.39 -2.57,0 -4.66,1.97 -4.66,4.39 0,1.44 0.32,2.77 0.93,3.85 0.64,1.15 1.08,1.64 1.85,2.42 0.19,0.2 0.19,0.51 0,0.71 -0.11,0.1 -0.24,0.15 -0.37,0.15zM16.92,19.94c-1.19,0 -2.24,-0.3 -3.1,-0.89 -1.49,-1.01 -2.38,-2.65 -2.38,-4.39 0,-0.28 0.22,-0.5 0.5,-0.5s0.5,0.22 0.5,0.5c0,1.41 0.72,2.74 1.94,3.56 0.71,0.48 1.54,0.71 2.54,0.71 0.24,0 0.64,-0.03 1.04,-0.1 0.27,-0.05 0.53,0.13 0.58,0.41 0.05,0.27 -0.13,0.53 -0.41,0.58 -0.57,0.11 -1.07,0.12 -1.21,0.12zM14.91,22c-0.04,0 -0.09,-0.01 -0.13,-0.02 -1.59,-0.44 -2.63,-1.03 -3.72,-2.1 -1.4,-1.39 -2.17,-3.24 -2.17,-5.22 0,-1.62 1.38,-2.94 3.08,-2.94 1.7,0 3.08,1.32 3.08,2.94 0,1.07 0.93,1.94 2.08,1.94s2.08,-0.87 2.08,-1.94c0,-3.77 -3.25,-6.83 -7.25,-6.83 -2.84,0 -5.44,1.58 -6.61,4.03 -0.39,0.81 -0.59,1.76 -0.59,2.8 0,0.78 0.07,2.01 0.67,3.61 0.1,0.26 -0.03,0.55 -0.29,0.64 -0.26,0.1 -0.55,-0.04 -0.64,-0.29 -0.49,-1.31 -0.73,-2.61 -0.73,-3.96 0,-1.2 0.23,-2.29 0.68,-3.24 1.33,-2.79 4.28,-4.6 7.51,-4.6 4.55,0 8.25,3.51 8.25,7.83 0,1.62 -1.38,2.94 -3.08,2.94s-3.08,-1.32 -3.08,-2.94c0,-1.07 -0.93,-1.94 -2.08,-1.94s-2.08,0.87 -2.08,1.94c0,1.71 0.66,3.31 1.87,4.51 0.95,0.94 1.86,1.46 3.27,1.85 0.27,0.07 0.42,0.35 0.35,0.61 -0.05,0.23 -0.26,0.38 -0.47,0.38z"/>
+</vector>

app/src/main/res/layouts/alert/layout/popup_find.xml

@@ -20,20 +20,20 @@
         app:layout_constraintStart_toStartOf="parent">
 
         <EditText
-            android:layout_width="wrap_content"
             android:id="@+id/pFindText"
-            android:background="@color/c_background"
+            android:layout_width="0dp"
-            android:textColorHint="@color/c_hint_text"
             android:layout_height="match_parent"
-            android:layout_weight="3"
+            android:layout_weight="5"
+            android:autofillHints="yes"
+            android:background="@color/c_background"
             android:focusedByDefault="true"
-            android:textColor="@color/c_text_v1"
-            android:textSize="16sp"
-            android:padding="15dp"
             android:hint="@string/GENERAL_FIND_HINT"
-            android:inputType="text"
             android:importantForAutofill="yes"
-            android:autofillHints="yes">
+            android:inputType="text"
+            android:padding="15dp"
+            android:textColor="@color/c_text_v1"
+            android:textColorHint="@color/c_hint_text"
+            android:textSize="16sp">
 
         </EditText>
 
@@ -43,7 +43,7 @@
             android:layout_marginEnd="5dp"
             android:layout_marginStart="5dp"
             android:singleLine="true"
-            android:width="100dp"
+            android:width="60dp"
             android:text="0/0"
             android:textColor="@color/c_text_v6"
             android:layout_height="wrap_content"

app/src/main/res/layouts/setting/layout/setting.xml

@@ -1143,6 +1143,83 @@
 
                 </LinearLayout>
 
+                <View
+                    android:id="@+id/view5"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginStart="15dp"
+                    android:background="@color/c_view_divier_background" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@xml/gx_ripple_gray"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="horizontal"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="13dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="5dp"
+                        android:layout_marginEnd="5dp"
+                        android:contentDescription="@string/GENERAL_TODO"
+                        android:padding="10dp"
+                        android:src="@xml/ic_baseline_fingerprint"
+                        app:tint="@color/c_icon_tint" />
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="6"
+                        android:clickable="false"
+                        android:orientation="vertical">
+
+                        <Button
+                            android:layout_width="match_parent"
+                            android:layout_height="20dp"
+                            android:alpha="1"
+                            android:background="@android:color/transparent"
+                            android:clickable="false"
+                            android:padding="0dp"
+                            android:text="Cicada | 3301"
+                            android:textAlignment="textStart"
+                            android:textAllCaps="false"
+                            android:textColor="@color/c_text_v1"
+                            android:textSize="15sp"
+                            tools:ignore="RtlSymmetry" />
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:alpha="1"
+                            android:background="@android:color/transparent"
+                            android:clickable="false"
+                            android:padding="0dp"
+                            android:text="VGhcewlcmUgaXMgbm8gR29kIGJ1dCBBbGxhaCwgTXVoYW1tYWQgaXMgdGhlIE1lc3NlbmdlciBvZiBBbGxhadsxA=="
+                            android:textAlignment="textStart"
+                            android:textAllCaps="false"
+                            android:textColor="@color/c_text_v6"
+                            android:textSize="13.5sp"
+                            tools:ignore="HardcodedText,RtlSymmetry" />
+                    </LinearLayout>
+
+                    <ImageButton
+                        android:layout_width="45dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginEnd="5dp"
+                        android:background="@android:color/transparent"
+                        android:clickable="false"
+                        android:contentDescription="@string/GENERAL_TODO"
+                        android:src="@xml/ic_arrow_right"
+                        android:tint="@color/c_navigation_tint" />
+
+                </LinearLayout>
+
             </LinearLayout>
         </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>

app/variables.gradle

@@ -42,7 +42,7 @@ project.ext.version_name = "Build | Dark-Origin"
 project.ext.compile_sdk_version = 30
 project.ext.min_sdk_version = 21
 project.ext.target_sdk_version = 30
-project.ext.build_tool_version = '30.0.0'
+project.ext.build_tool_version = '30.0.3'
 project.ext.ndk_version = '21.4.7075529'
 project.ext.application_id = "com.darkweb.genesissearchengine"
 

build.gradle

@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.google.gms:google-services:4.3.5'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
     }

gradle.properties

@@ -0,0 +1,4 @@
+android.useAndroidX=true
+android.enableJetifier=true
+org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+kotlin.code.style=official

gradle/wrapper/gradle-wrapper.properties

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

orbotmanager/build.gradle

@@ -1,9 +1,9 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
-    buildToolsVersion '29.0.3'
+    buildToolsVersion '30.0.3'
-    ndkVersion '21.3.6528147'
+    ndkVersion '21.4.7075529'
 
     sourceSets {
         main {
@@ -12,8 +12,8 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 30
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

orbotmanager/src/main/java/org/torproject/android/proxy/OrbotService.java

@@ -262,11 +262,11 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
             Intent intentRefresh = new Intent(CMD_NEWNYM);
             PendingIntent pendingIntentNewNym = PendingIntent.getBroadcast(this, 0, intentRefresh, PendingIntent.FLAG_UPDATE_CURRENT);
             mNotifyBuilder.addAction(R.drawable.ic_stat_starting_tor_logo, getString(R.string.menu_new_identity), pendingIntentNewNym);
-        }
 
-        Intent intentRefresh = new Intent(CMD_SETTING);
+            Intent intentSetting = new Intent(CMD_SETTING);
-        PendingIntent pendingIntentNewNym = PendingIntent.getBroadcast(this, 0, intentRefresh, PendingIntent.FLAG_UPDATE_CURRENT);
+            PendingIntent pendingIntentSetting = PendingIntent.getBroadcast(this, 0, intentSetting, PendingIntent.FLAG_UPDATE_CURRENT);
-        mNotifyBuilder.addAction(0, "Notification Settings", pendingIntentNewNym);
+            mNotifyBuilder.addAction(0, "Notification Settings", pendingIntentSetting);
+        }
 
         mNotifyBuilder.setContentText(notifyMsg)
                 .setSmallIcon(icon)