diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 36e5bbf0..28e5b907 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -35,5 +35,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ca2d12c0..345de996 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,9 +34,10 @@
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"/>
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
deleted file mode 100644
index ce270c5f..00000000
Binary files a/app/src/main/ic_launcher-playstore.png and /dev/null differ
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/activityContextManager.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/activityContextManager.java
index b24cb363..9ad43708 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/activityContextManager.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/activityContextManager.java
@@ -5,7 +5,8 @@ import com.darkweb.genesissearchengine.appManager.bookmarkManager.bookmarkContro
import com.darkweb.genesissearchengine.appManager.historyManager.historyController;
import com.darkweb.genesissearchengine.appManager.homeManager.homeController;
import com.darkweb.genesissearchengine.appManager.orbotLogManager.orbotLogController;
-import com.darkweb.genesissearchengine.appManager.settingManager.settingHomePage.settingController;
+import com.darkweb.genesissearchengine.appManager.settingManager.generalManager.settingGeneralController;
+import com.darkweb.genesissearchengine.appManager.settingManager.settingHomePage.settingHomeController;
import com.darkweb.genesissearchengine.appManager.tabManager.tabController;
import java.util.ArrayList;
@@ -25,7 +26,8 @@ public class activityContextManager
private homeController pHomeController;
private tabController pTabController;
private android.app.Activity pCurrentActivity = null;
- private settingController pSettingController;
+ private settingHomeController pSettingController;
+ private settingGeneralController pSettingGeneralController;
private orbotLogController pOrbotLogController;
private ArrayList mStackList;
@@ -72,10 +74,18 @@ public class activityContextManager
this.pOrbotLogController = pOrbotLogController;
}
- public settingController getSettingController(){
+
+ public settingGeneralController getSettingGeneralController(){
+ return pSettingGeneralController;
+ }
+ public void setSettingGeneralController(settingGeneralController pSettingGeneralController){
+ this.pSettingGeneralController = pSettingGeneralController;
+ }
+
+ public settingHomeController getSettingController(){
return pSettingController;
}
- public void setSettingController(settingController pSettingController){
+ public void setSettingController(settingHomeController pSettingController){
this.pSettingController = pSettingController;
}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkAdapter.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkAdapter.java
index f7e90998..0c280322 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkAdapter.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkAdapter.java
@@ -26,7 +26,7 @@ import java.util.Date;
import java.util.List;
import static android.content.Context.LAYOUT_INFLATER_SERVICE;
-import static com.darkweb.genesissearchengine.constants.constants.BOOKMARK_LOAD_MORE;
+import static com.darkweb.genesissearchengine.constants.constants.CONST_BOOKMARK_LOAD_MORE;
public class bookmarkAdapter extends RecyclerView.Adapter
{
@@ -67,14 +67,14 @@ public class bookmarkAdapter extends RecyclerView.Adapter {
- mCurrentList.add(new bookmarkRowModel(BOOKMARK_LOAD_MORE,null,-2));
+ mCurrentList.add(new bookmarkRowModel(CONST_BOOKMARK_LOAD_MORE,null,-2));
notifyItemInserted(mCurrentList.size());
});
}
private void onLoadingClear(){
for(int mCounter = 0; mCounter< mCurrentList.size(); mCounter++){
- if(mCurrentList.get(mCounter).getHeader().equals(BOOKMARK_LOAD_MORE)){
+ if(mCurrentList.get(mCounter).getHeader().equals(CONST_BOOKMARK_LOAD_MORE)){
int finalM_counter = mCounter;
mContext.runOnUiThread(() -> {
mCurrentList.remove(finalM_counter);
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkController.java
index 1bd05af5..3b266de8 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkController.java
@@ -44,6 +44,8 @@ import java.util.List;
import java.util.Objects;
import static com.darkweb.genesissearchengine.appManager.bookmarkManager.bookmarkEnums.eBookmarkViewCommands.M_VERTIFY_SELECTION_MENU;
+import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.M_CLEAR_BOOKMARK;
+import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.M_NOT_SUPPORTED;
public class bookmarkController extends AppCompatActivity
@@ -72,7 +74,7 @@ public class bookmarkController extends AppCompatActivity
@Override
protected void onCreate(Bundle savedInstanceState){
- pluginController.getInstance().onCreate(this);
+ pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_ACTIVITY_CREATED);
super.onCreate(savedInstanceState);
setContentView(R.layout.bookmark_view);
initializeListModel();
@@ -87,7 +89,6 @@ public class bookmarkController extends AppCompatActivity
mContextManager = activityContextManager.getInstance();
mHomeController = activityContextManager.getInstance().getHomeController();
mContextManager.setBookmarkController(this);
- pluginController.getInstance().logEvent(strings.EVENT_BOOKMARK_OPENED);
}
public void initializeViews(){
mEmptyListNotification = findViewById(R.id.pEmptyListNotification);
@@ -116,7 +117,6 @@ public class bookmarkController extends AppCompatActivity
public void initCustomListeners(){
mClearButton.requestFocusFromTouch();
- mClearButton.setOnClickListener(v -> pluginController.getInstance().MessageManagerHandler(activityContextManager.getInstance().getBookmarkController(), Collections.singletonList(strings.GENERIC_EMPTY_STR), enums.eMessageEnums.M_CLEAR_BOOKMARK));
mSearchInput.setOnEditorActionListener((v, actionId, event) ->{
if (actionId == EditorInfo.IME_ACTION_NEXT)
@@ -212,9 +212,9 @@ public class bookmarkController extends AppCompatActivity
@Override
public void onResume()
{
+ pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_RESUME);
activityContextManager.getInstance().setCurrentActivity(this);
status.sSettingIsAppPaused = false;
-
activityContextManager.getInstance().onStack(this);
super.onResume();
}
@@ -300,13 +300,11 @@ public class bookmarkController extends AppCompatActivity
{
if(e_type.equals(enums.etype.url_triggered)){
String url_temp = helperMethod.completeURL(data.get(0).toString());
- pluginController.getInstance().logEvent(strings.EVENT_BOOKMARK_TRIGGERED);
mHomeController.onLoadURL(url_temp);
finish();
}
else if(e_type.equals(enums.etype.url_triggered_new_tab)){
String url_temp = helperMethod.completeURL(data.get(0).toString());
- pluginController.getInstance().logEvent(strings.EVENT_BOOKMARK_TRIGGERED);
mHomeController.onOpenLinkNewTab(url_temp);
finish();
}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bridgeManager/bridgeController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bridgeManager/bridgeController.java
index bf5757c3..d7d5ebb0 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bridgeManager/bridgeController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bridgeManager/bridgeController.java
@@ -26,6 +26,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.M_BRIDGE_MAIL;
+
public class bridgeController extends AppCompatActivity {
@@ -44,7 +46,7 @@ public class bridgeController extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
- pluginController.getInstance().onCreate(this);
+ pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_ACTIVITY_CREATED);
super.onCreate(savedInstanceState);
setContentView(R.layout.bridge_settings_view);
@@ -129,6 +131,7 @@ public class bridgeController extends AppCompatActivity {
@Override
public void onResume()
{
+ pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_RESUME);
activityContextManager.getInstance().setCurrentActivity(this);
super.onResume();
}
@@ -152,7 +155,7 @@ public class bridgeController extends AppCompatActivity {
public void requestBridges(View view){
mBridgeModel.onTrigger(bridgeEnums.eBridgeModelCommands.M_REQUEST_BRIDGE, null);
- pluginController.getInstance().MessageManagerHandler(this, Collections.singletonList(constants.CONST_BACKEND_GOOGLE_URL), enums.eMessageEnums.M_BRIDGE_MAIL);
+ pluginController.getInstance().onMessageManagerInvoke(Arrays.asList(constants.CONST_BACKEND_GOOGLE_URL, this), M_BRIDGE_MAIL);
}
public void onCustomChecked(View view){
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bridgeManager/bridgeModel.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bridgeManager/bridgeModel.java
index 25404ba4..5276408e 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bridgeManager/bridgeModel.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bridgeManager/bridgeModel.java
@@ -11,12 +11,13 @@ import com.darkweb.genesissearchengine.dataManager.dataController;
import com.darkweb.genesissearchengine.dataManager.dataEnums;
import com.darkweb.genesissearchengine.helperManager.eventObserver;
import com.darkweb.genesissearchengine.pluginManager.pluginController;
-import com.darkweb.genesissearchengine.pluginManager.pluginEnums;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.M_BRIDGE_MAIL;
+
class bridgeModel
{
/*Variable Declaration*/
@@ -34,7 +35,7 @@ class bridgeModel
/*Helper Methods*/
public void requestBridges(){
- pluginController.getInstance().MessageManagerHandler(mContext, Collections.singletonList(constants.CONST_BACKEND_GOOGLE_URL), enums.eMessageEnums.M_BRIDGE_MAIL);
+ pluginController.getInstance().onMessageManagerInvoke(Arrays.asList(constants.CONST_BACKEND_GOOGLE_URL, mContext), M_BRIDGE_MAIL);
}
public void onCustomChecked(){
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/helpManager/editTextManager.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/helpManager/editViewController.java
similarity index 74%
rename from app/src/main/java/com/darkweb/genesissearchengine/appManager/helpManager/editTextManager.java
rename to app/src/main/java/com/darkweb/genesissearchengine/appManager/helpManager/editViewController.java
index 8eab9199..a040039a 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/helpManager/editTextManager.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/helpManager/editViewController.java
@@ -3,29 +3,27 @@ package com.darkweb.genesissearchengine.appManager.helpManager;
import android.content.Context;
import android.util.AttributeSet;
import android.view.KeyEvent;
-
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-
import com.darkweb.genesissearchengine.constants.enums;
import com.darkweb.genesissearchengine.helperManager.eventObserver;
-public class editTextManager extends androidx.appcompat.widget.AppCompatAutoCompleteTextView {
+public class editViewController extends androidx.appcompat.widget.AppCompatAutoCompleteTextView {
Context mContext;
private eventObserver.eventListener mEvent = null;
- public editTextManager(@NonNull Context context) {
+ public editViewController(@NonNull Context context) {
super(context);
mContext = context;
}
- public editTextManager(@NonNull Context context, @Nullable AttributeSet attrs) {
+ public editViewController(@NonNull Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
mContext = context;
}
- public editTextManager(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+ public editViewController(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
mContext = context;
}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/helpManager/helpController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/helpManager/helpController.java
index bc2a9c3f..08bf41e7 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/helpManager/helpController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/helpManager/helpController.java
@@ -7,14 +7,12 @@ import android.text.TextWatcher;
import android.view.MotionEvent;
import android.view.View;
import android.widget.Button;
-import android.widget.EditText;
import android.widget.ProgressBar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.SimpleItemAnimator;
-
import com.darkweb.genesissearchengine.appManager.activityContextManager;
import com.darkweb.genesissearchengine.constants.constants;
import com.darkweb.genesissearchengine.constants.enums;
@@ -22,6 +20,7 @@ import com.darkweb.genesissearchengine.constants.status;
import com.darkweb.genesissearchengine.helperManager.eventObserver;
import com.darkweb.genesissearchengine.helperManager.helperMethod;
import com.darkweb.genesissearchengine.pluginManager.pluginController;
+import com.darkweb.genesissearchengine.pluginManager.pluginEnums;
import com.example.myapplication.R;
import java.util.ArrayList;
import java.util.Collections;
@@ -38,7 +37,7 @@ public class helpController extends AppCompatActivity {
private RecyclerView mRecycleView;
private ConstraintLayout mRetryContainer;
private Button mReloadButton;
- private editTextManager mSearchInput;
+ private editViewController mSearchInput;
/*Private Variables*/
private Handler mSearchInvokedHandler = new Handler();
@@ -46,7 +45,7 @@ public class helpController extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
- pluginController.getInstance().onCreate(this);
+ pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_ACTIVITY_CREATED);
super.onCreate(savedInstanceState);
setContentView(R.layout.help_view);
@@ -74,7 +73,7 @@ public class helpController extends AppCompatActivity {
}
- public void initializeLocalEventHandlers(){
+ private void initializeLocalEventHandlers(){
mRecycleView.addOnItemTouchListener(new RecyclerView.OnItemTouchListener() {
@@ -105,9 +104,7 @@ public class helpController extends AppCompatActivity {
mSearchInput.setEventHandler(new edittextManagerCallback());
- postToServerRunnable = () -> {
- mHelpAdapter.onTrigger(helpEnums.eHelpAdapter.M_INIT_FILTER, Collections.singletonList(mSearchInput.getText().toString()));
- };
+ postToServerRunnable = () -> mHelpAdapter.onTrigger(helpEnums.eHelpAdapter.M_INIT_FILTER, Collections.singletonList(mSearchInput.getText().toString()));
mSearchInput.addTextChangedListener(new TextWatcher() {
@@ -127,35 +124,9 @@ public class helpController extends AppCompatActivity {
});
}
- public class edittextManagerCallback implements eventObserver.eventListener {
- @Override
- public Object invokeObserver(List