diff --git a/.idea/misc.xml b/.idea/misc.xml index f5a7599d..7bcea2ac 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -58,6 +58,7 @@ + diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png deleted file mode 100755 index f40c1cfe..00000000 Binary files a/app/src/main/ic_launcher-web.png and /dev/null differ 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 de031d9c..ef7e6394 100755 --- a/app/src/main/java/com/darkweb/genesissearchengine/constants/status.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/status.java @@ -44,6 +44,7 @@ public class status public static boolean sSettingIsAppPaused = false; public static boolean sSettingIsWelcomeEnabled = true; public static boolean sSettingIsAppStarted = false; + public static boolean sCrawlerStatusStarted = false; public static boolean sSettingIsAppRunning = false; public static boolean sSettingIsAppRedirected = false; public static boolean sSettingIsAppRestarting = false; diff --git a/app/src/main/java/com/darkweb/genesissearchengine/dataManager/crawlerDataModel.java b/app/src/main/java/com/darkweb/genesissearchengine/dataManager/crawlerDataModel.java index 6fe683b3..6c00e9e3 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/dataManager/crawlerDataModel.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/dataManager/crawlerDataModel.java @@ -1,13 +1,12 @@ package com.darkweb.genesissearchengine.dataManager; -import static java.lang.Thread.sleep; import android.annotation.SuppressLint; -import android.os.AsyncTask; import androidx.appcompat.app.AppCompatActivity; import com.android.volley.Request; import com.android.volley.RequestQueue; import com.android.volley.toolbox.StringRequest; import com.android.volley.toolbox.Volley; +import com.darkweb.genesissearchengine.constants.status; import com.darkweb.genesissearchengine.constants.strings; import com.darkweb.genesissearchengine.dataManager.models.crawlerRowModel; import com.darkweb.genesissearchengine.helperManager.helperMethod; @@ -15,6 +14,8 @@ import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; +import org.mozilla.thirdparty.com.google.android.exoplayer2.util.Log; + import java.net.URLEncoder; import java.util.ArrayList; import java.util.HashMap; @@ -38,7 +39,10 @@ class crawlerDataModel } private void onInit(){ - onExecute(); + if(!status.sCrawlerStatusStarted){ + status.sCrawlerStatusStarted = true; + onExecute(); + } } private void onParseHTML(String pHtml, String pURL){ @@ -113,8 +117,10 @@ class crawlerDataModel StringRequest stringRequest = new StringRequest(Request.Method.GET, mURL_POST, response -> { + Log.i("adsa","asd"); }, error -> { + Log.i("adsa","asd"); }); RequestQueue requestQueue = Volley.newRequestQueue(mContext); diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messagePluginManager/messageManager.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messagePluginManager/messageManager.java index 70f7f1d6..c12528a1 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messagePluginManager/messageManager.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messagePluginManager/messageManager.java @@ -48,6 +48,7 @@ import static com.darkweb.genesissearchengine.constants.strings.MESSAGE_SECURE_O import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.*; import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManagerCallbacks.*; import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManagerCallbacks.M_CLEAR_BOOKMARK; +import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManagerCallbacks.M_CLEAR_HISTORY; import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManagerCallbacks.M_LOAD_NEW_TAB; public class messageManager implements View.OnClickListener, DialogInterface.OnDismissListener @@ -538,7 +539,11 @@ public class messageManager implements View.OnClickListener, DialogInterface.OnD }else if(mPopupRateusRating.getRating()>0) { mEvent.invokeObserver(null, M_APP_RATED); final Handler handler = new Handler(); - handler.postDelayed(() -> onTrigger(Arrays.asList(strings.GENERIC_EMPTY_STR, mContext),M_RATE_FAILURE), 1000); + handler.postDelayed(() -> { + if(mContext!=null){ + onTrigger(Arrays.asList(strings.GENERIC_EMPTY_STR, mContext), M_RATE_FAILURE); + } + }, 1000); onDismiss(); } } @@ -715,7 +720,7 @@ public class messageManager implements View.OnClickListener, DialogInterface.OnD case M_CLEAR_HISTORY: /*VERIFIED*/ - onShowToast(R.layout.popup_toast_generic,R.xml.ax_background_important, 12000, mContext.getString(R.string.ALERT_CLEAR_HISTORY), mContext.getString(R.string.ALERT_CONFIRM), M_CLEAR_BOOKMARK); + onShowToast(R.layout.popup_toast_generic,R.xml.ax_background_important, 12000, mContext.getString(R.string.ALERT_CLEAR_HISTORY), mContext.getString(R.string.ALERT_CONFIRM), M_CLEAR_HISTORY); break; case M_CLEAR_BOOKMARK: diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java index a9ff1813..0f8202dc 100755 --- a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java @@ -37,6 +37,7 @@ import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eLangMan import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.*; import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManagerCallbacks.*; import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManagerCallbacks.M_CLEAR_BOOKMARK; +import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManagerCallbacks.M_CLEAR_HISTORY; import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManagerCallbacks.M_LOAD_NEW_TAB; public class pluginController @@ -347,7 +348,6 @@ public class pluginController else if(pEventType.equals(M_IMAGE_UPDATE_RESTART)){ if(pData!=null && pData.get(0)!=null){ ((AppCompatActivity)pData.get(0)).finish(); - activityContextManager.getInstance().getSettingController().finish(); activityContextManager.getInstance().getHomeController().quitApplication(); } new Thread(){ diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginEnums.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginEnums.java index 12d5765e..b14e8185 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginEnums.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginEnums.java @@ -31,7 +31,7 @@ public class pluginEnums M_RESET, M_DATA_CLEARED, M_COPY, M_APPLICATION_CRASH, M_DELETE_BOOKMARK, M_UPDATE_BOOKMARK, M_IMAGE_UPDATE,M_OPEN_ACTIVITY_FAILED, M_OPEN_CICADA, M_SECURE_CONNECTION, M_SECURITY_INFO, M_POPUP_BLOCKED, M_PANIC, M_MAX_TAB_REACHED, M_ORBOT_LOADING, M_LOAD_NEW_TAB, M_UNDO,M_DOWNLOAD_SINGLE, M_UPDATE_BRIDGES, M_NEW_IDENTITY, M_NOT_SUPPORTED, M_BRIDGE_MAIL, M_LONG_PRESS_WITH_LINK, M_LONG_PRESS_URL, M_LONG_PRESS_DOWNLOAD, M_START_ORBOT, M_DOWNLOAD_FAILURE, M_DOWNLOAD_FILE, M_RATE_APP, M_REPORT_URL, M_CLEAR_BOOKMARK, M_CLEAR_HISTORY, M_BOOKMARK, M_PANIC_RESET, M_RATE_SUCCESS, M_RATE_FAILURE, M_LANGUAGE_SUPPORT_FAILURE, M_WELCOME } public enum eMessageManagerCallbacks{ - M_CANCEL_WELCOME, M_APP_RATED, M_DOWNLOAD_FILE_MANUAL, M_OPEN_LINK_CURRENT_TAB, M_COPY_LINK, M_REQUEST_BRIDGES, M_SET_BRIDGES, M_OPEN_LINK_NEW_TAB, M_CLEAR_TAB, M_RATE_APPLICATION, M_OPEN_PRIVACY, M_CLEAR_BOOKMARK,M_ADJUST_INPUT_RESIZE, M_UNDO_SESSION, M_OPEN_LOGS, M_LOAD_NEW_TAB, M_UNDO_TAB, M_CUSTOM_BRIDGE, M_BRIDGE_TYPE, M_DATA_CLEARED_EXTERNAL, M_IMAGE_UPDATE_RESTART + M_CANCEL_WELCOME, M_APP_RATED, M_DOWNLOAD_FILE_MANUAL, M_OPEN_LINK_CURRENT_TAB, M_COPY_LINK, M_REQUEST_BRIDGES, M_SET_BRIDGES, M_OPEN_LINK_NEW_TAB, M_CLEAR_TAB, M_RATE_APPLICATION, M_OPEN_PRIVACY, M_CLEAR_HISTORY, M_CLEAR_BOOKMARK,M_ADJUST_INPUT_RESIZE, M_UNDO_SESSION, M_OPEN_LOGS, M_LOAD_NEW_TAB, M_UNDO_TAB, M_CUSTOM_BRIDGE, M_BRIDGE_TYPE, M_DATA_CLEARED_EXTERNAL, M_IMAGE_UPDATE_RESTART } /*Download Manager*/ diff --git a/app/src/main/res/layouts/alert/layout/popup_toast_generic.xml b/app/src/main/res/layouts/alert/layout/popup_toast_generic.xml index aec56716..b509a7e1 100644 --- a/app/src/main/res/layouts/alert/layout/popup_toast_generic.xml +++ b/app/src/main/res/layouts/alert/layout/popup_toast_generic.xml @@ -75,7 +75,4 @@ app:layout_constraintTop_toTopOf="parent" /> - - - \ No newline at end of file diff --git a/app/src/main/res/layouts/history/layout/history_view.xml b/app/src/main/res/layouts/history/layout/history_view.xml index c3893946..9cca7ece 100644 --- a/app/src/main/res/layouts/history/layout/history_view.xml +++ b/app/src/main/res/layouts/history/layout/history_view.xml @@ -188,7 +188,7 @@ android:layout_width="match_parent" android:layout_height="50dp" android:layout_marginStart="15dp" - android:layout_marginTop="7dp" + android:layout_marginTop="70dp" android:layout_marginEnd="15dp" android:alpha="0" android:background="@xml/hx_ripple_default_round_bottom" diff --git a/app/src/main/splashlogoclip-playstore.png b/app/src/main/splashlogoclip-playstore.png deleted file mode 100644 index 9ad6cb99..00000000 Binary files a/app/src/main/splashlogoclip-playstore.png and /dev/null differ diff --git a/app/variables.gradle b/app/variables.gradle index cddbde3d..7a33576a 100755 --- a/app/variables.gradle +++ b/app/variables.gradle @@ -1,6 +1,6 @@ /* Version */ -project.ext.vname = 'Build | Dark-Origin 1.4.8.0' -project.ext.vcode = 250 +project.ext.vname = 'Build | Dark-Origin 1.4.8.2' +project.ext.vcode = 265 project.ext.buildType = 'release' /* dimension */