From 841837655485f3273f3bdaa4541c5b378176da67 Mon Sep 17 00:00:00 2001 From: msmannan00 Date: Fri, 19 Feb 2021 12:51:37 +0500 Subject: [PATCH] Bug Fixes Bug Fixes --- app/src/main/assets/Homepage/homepage.html | 30 ++++- .../Homepage/javascript/enum-homepage.js | 23 ++++ .../assets/Homepage/javascript/js-homepage.js | 56 ++++++++ .../Homepage/javascript/string-homepage.js | 6 + .../assets/Homepage/style/cs-homepage.css | 57 +++++++++ .../bookmarkManager/bookmarkAdapter.java | 120 +++++++++--------- .../databaseManager/databaseController.java | 4 +- .../historyManager/historyAdapter.java | 86 ++++++------- .../historyManager/historyController.java | 14 +- .../historyManager/historyEnums.java | 2 +- .../geckoManager/geckoClients.java | 5 +- .../geckoManager/geckoSession.java | 20 ++- .../homeController/homeController.java | 5 + .../homeController/homeViewController.java | 17 +++ .../logManager/settingLogController.java | 1 + .../tabManager/tabViewController.java | 2 +- .../constants/constants.java | 1 + .../genesissearchengine/constants/enums.java | 2 +- .../genesissearchengine/constants/keys.java | 1 + .../genesissearchengine/constants/status.java | 4 +- .../constants/strings.java | 1 + .../dataManager/dataController.java | 9 +- .../dataManager/dataEnums.java | 4 + .../referenceWebsiteDataModel.java | 56 ++++++++ .../pluginManager/adManager.java | 4 - .../layouts/bookmark/layout/bookmark_view.xml | 3 +- .../layouts/history/layout/history_view.xml | 13 +- .../layout/history_bookmark_row_view.xml | 24 ++-- .../main/res/layouts/tab/layout/tab_view.xml | 2 - 29 files changed, 415 insertions(+), 157 deletions(-) create mode 100644 app/src/main/assets/Homepage/javascript/enum-homepage.js create mode 100644 app/src/main/assets/Homepage/javascript/js-homepage.js create mode 100644 app/src/main/assets/Homepage/javascript/string-homepage.js create mode 100644 app/src/main/java/com/darkweb/genesissearchengine/dataManager/referenceWebsiteDataModel.java diff --git a/app/src/main/assets/Homepage/homepage.html b/app/src/main/assets/Homepage/homepage.html index 2a19d7fc..dee1eeaa 100644 --- a/app/src/main/assets/Homepage/homepage.html +++ b/app/src/main/assets/Homepage/homepage.html @@ -13,21 +13,22 @@ - + - + + + Genesis Search Engine | Dark Web Based Search Engine - + -
@@ -50,13 +51,32 @@

Privacy, simplified Help Spread Genesis!

+ + +
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
diff --git a/app/src/main/assets/Homepage/javascript/enum-homepage.js b/app/src/main/assets/Homepage/javascript/enum-homepage.js new file mode 100644 index 00000000..f23f5ed7 --- /dev/null +++ b/app/src/main/assets/Homepage/javascript/enum-homepage.js @@ -0,0 +1,23 @@ + +/*Enums*/ + +var Commands = { + onLoadReferenceWebsites : "onLoadReferenceWebsites", +}; + +/*Links*/ + +var GET = { + pData : "pData", +}; + + +var UIID = { + mReferenceWebsites : "mReferenceWebsites", +}; + +var ReferenceWebsitesDataID = { + mIcon : "mIcon", + mHeader : "mHeader", + mBody : "mBody", +}; diff --git a/app/src/main/assets/Homepage/javascript/js-homepage.js b/app/src/main/assets/Homepage/javascript/js-homepage.js new file mode 100644 index 00000000..b742d062 --- /dev/null +++ b/app/src/main/assets/Homepage/javascript/js-homepage.js @@ -0,0 +1,56 @@ + +/*Homepage Classes*/ + +class homepage { + + constructor() { + } + + /*Helper Methods*/ + + onLoadReferenceWebsites(){ + document.getElementById('mReferenceWebsites').className = 'hide'; + } + + onLoadReferenceWebsiteContent(mJson){ + var mResponseJson = mJson; + var obj = JSON.parse(mResponseJson); + var mReferenceHTML = strings.emptyString; + + Object.keys(obj).forEach(function(key) { + var mObject = obj[key]; + mReferenceHTML += '
'+mObject[ReferenceWebsitesDataID.mHeader]+'

'+mObject[ReferenceWebsitesDataID.mBody]+'

' + }); + + + var mReferenceID = document.getElementById(UIID.mReferenceWebsites); + mReferenceID.innerHTML = mReferenceHTML; + + document.getElementById('mReferenceWebsites').className = 'show'; + } + + /*Ajax Request*/ + + onParseReferenceWebsites() { + var $_GET=[]; + decodeURIComponent(window.location.href).replace(/[?&]+([^=&]+)=([^&]*)/gi,function(a,name,value){$_GET[name]=value;}); + + setTimeout(mHomepageLoader.onLoadReferenceWebsites, 500); + setTimeout(mHomepageLoader.onLoadReferenceWebsiteContent, 1000, $_GET[GET.pData]); + } + +} + +let mHomepageLoader = new homepage(); + +/*Helper Classes Manager*/ +function onTriggerScriptHandler(pCommand) { + if(pCommand == Commands.onLoadReferenceWebsites){ + mHomepageLoader.onParseReferenceWebsites() + } +} + +/*Default Loaders*/ +$(window).on('load', function() { + onTriggerScriptHandler(Commands.onLoadReferenceWebsites) +}); diff --git a/app/src/main/assets/Homepage/javascript/string-homepage.js b/app/src/main/assets/Homepage/javascript/string-homepage.js new file mode 100644 index 00000000..1406b380 --- /dev/null +++ b/app/src/main/assets/Homepage/javascript/string-homepage.js @@ -0,0 +1,6 @@ + +/*Strings*/ + +var strings = { + emptyString : "", +}; diff --git a/app/src/main/assets/Homepage/style/cs-homepage.css b/app/src/main/assets/Homepage/style/cs-homepage.css index 8409fe5a..b73b73a4 100644 --- a/app/src/main/assets/Homepage/style/cs-homepage.css +++ b/app/src/main/assets/Homepage/style/cs-homepage.css @@ -75,6 +75,31 @@ transition: .0s; } +.hi_reference{ + align-self: center; + height:auto; + padding: 10px; + padding-bottom: 0px; + border-radius: 6px; + outline: none; + + border: 1px solid #f0f0f0; + box-shadow: 0 3px 3px 0 #cccccc; + width:91% !important; + max-width: 575px; + display:block; + font:16px arial,sans-serif; + color: black; + margin: 0 auto 0px; + margin-top: -15px; + margin-bottom: 35px; + + -webkit-transition: .0s; + -moz-transition: .0s; + -o-transition: .0s; + transition: .0s; +} + @media only screen and (max-width: 943px) { .hi_search__search-box { margin-top: 30px; @@ -192,3 +217,35 @@ } } + +.hi_loader { + border: 4px solid #f3f3f3; + border-radius: 50%; + border-top: 4px solid #3498db; + width: 30px; + float: left; + height: 30px; + -webkit-animation: spin 2s linear infinite; /* Safari */ + animation: spin 2s linear infinite; +} +line-style +/* Safari */ +@-webkit-keyframes spin { + 0% { -webkit-transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); } +} + +@keyframes spin { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } +} + +.show { + opacity: 1; + transition: opacity 500ms; +} + +.hide { + opacity: 0; + transition: opacity 350ms; +} \ No newline at end of file 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 0c280322..374129de 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 @@ -12,7 +12,6 @@ import android.widget.*; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.RecyclerView; - import com.darkweb.genesissearchengine.constants.enums; import com.darkweb.genesissearchengine.constants.strings; import com.darkweb.genesissearchengine.helperManager.eventObserver; @@ -24,9 +23,8 @@ import java.util.Calendar; import java.util.Collections; import java.util.Date; import java.util.List; - +import systems.intelligo.slight.ImageLoader; import static android.content.Context.LAYOUT_INFLATER_SERVICE; -import static com.darkweb.genesissearchengine.constants.constants.CONST_BOOKMARK_LOAD_MORE; public class bookmarkAdapter extends RecyclerView.Adapter { @@ -41,13 +39,14 @@ public class bookmarkAdapter extends RecyclerView.Adapter mLongSelectedIndex = new ArrayList<>(); private ArrayList mLongSelectedID = new ArrayList<>(); + private ImageLoader imageLoader; private AppCompatActivity mContext; - private bookmarkAdapterView mBookmarkAdapterView; + private bookmarkAdapterView mHistroyAdapterView; private Context mListHolderContext; private PopupWindow mPopupWindow = null; private eventObserver.eventListener mEvent; - boolean mLongPressedMenuActive = false; private String mFilter = strings.GENERIC_EMPTY_STR; + private boolean mLongPressedMenuActive = false; /*Local Variables*/ @@ -59,30 +58,15 @@ public class bookmarkAdapter extends RecyclerView.Adapter(); this.mPassedList = pModelList; this.mContext = pMainContext; - this.mBookmarkAdapterView = new bookmarkAdapterView(mContext); + this.mHistroyAdapterView = new bookmarkAdapterView(mContext); + this.imageLoader = new ImageLoader(mContext); initializeModelWithDate(false); } - - private void onLoading(){ - mContext.runOnUiThread(() -> { - 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(CONST_BOOKMARK_LOAD_MORE)){ - int finalM_counter = mCounter; - mContext.runOnUiThread(() -> { - mCurrentList.remove(finalM_counter); - notifyItemRemoved(finalM_counter); - }); - break; - } - } + public void onLoadMore(ArrayList pModelList){ + notifyDataSetChanged(); + initializeModelWithDate(false); } @@ -116,7 +100,7 @@ public class bookmarkAdapter extends RecyclerView.Adapter1){ - new Thread(){ - public void run(){ - try - { - sleep(500); - } - catch (InterruptedException e) - { - e.printStackTrace(); - } - } - }.start(); + notifyItemRemoved(pIndex); + notifyItemRangeChanged(pIndex, mCurrentList.size()); + notifyItemChanged(mCurrentList.size()-1); } } @@ -441,6 +413,7 @@ public class bookmarkAdapter extends RecyclerView.Adapter6){ + break; + } + } + mContext.runOnUiThread(() -> mFaviconLogo.setImageDrawable(mHindTypeIconTemp.getDrawable())); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + }.start(); setItemViewOnClickListener(mRowContainer, mRowMenu, mDescription.getText().toString(), p_position, header, mRowMenu, mLogoImage, model.getID(), model.getDate()); } @@ -501,10 +498,10 @@ public class bookmarkAdapter extends RecyclerView.Adapter0){ - mPopupWindow = (PopupWindow) mBookmarkAdapterView.onTrigger(bookmarkEnums.eBookmarkViewAdapterCommands.M_CLEAR_HIGHLIGHT, Arrays.asList(mRowContainer, mRowMenu, mLogoImage, true, false)); + mPopupWindow = (PopupWindow) mHistroyAdapterView.onTrigger(bookmarkEnums.eBookmarkViewAdapterCommands.M_CLEAR_HIGHLIGHT, Arrays.asList(mRowContainer, mRowMenu, mLogoImage, true, false)); } } } @@ -524,7 +521,7 @@ public class bookmarkAdapter extends RecyclerView.Adapter0; } @@ -532,12 +529,6 @@ public class bookmarkAdapter extends RecyclerView.Adapter selectHistory(int startIndex,int endIndex){ ArrayList tempmodel = new ArrayList<>(); - Cursor c = mDatabaseInstance.rawQuery("SELECT * FROM history ORDER BY date ASC LIMIT "+endIndex+" OFFSET "+startIndex, null); + Cursor c = mDatabaseInstance.rawQuery("SELECT * FROM history ORDER BY date DESC LIMIT " + endIndex + " OFFSET "+startIndex, null); if (c.moveToFirst()){ do { historyRowModel model = new historyRowModel(c.getString(3), c.getString(2),Integer.parseInt(c.getString(0))); @@ -93,7 +93,7 @@ public class databaseController if(Calendar.getInstance().getTime().getTime() < model.getDate().getTime()){ tempmodel.add(model); }else { - tempmodel.add(0, model); + tempmodel.add(model); } } while(c.moveToNext()); } diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyAdapter.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyAdapter.java index db630d77..9c69e79e 100755 --- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyAdapter.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyAdapter.java @@ -3,6 +3,7 @@ package com.darkweb.genesissearchengine.appManager.historyManager; import android.annotation.SuppressLint; import android.content.Context; import android.os.Handler; +import android.util.Log; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; @@ -28,7 +29,6 @@ import java.util.List; import systems.intelligo.slight.ImageLoader; import static android.content.Context.LAYOUT_INFLATER_SERVICE; -import static com.darkweb.genesissearchengine.constants.constants.CONST_HISTORY_LOAD_MORE; public class historyAdapter extends RecyclerView.Adapter { @@ -68,25 +68,9 @@ public class historyAdapter extends RecyclerView.Adapter { - mCurrentList.add(new historyRowModel(CONST_HISTORY_LOAD_MORE,null,-2)); - notifyItemInserted(mCurrentList.size()); - }); - } - - private void onLoadingClear(){ - for(int mCounter = 0; mCounter< mCurrentList.size(); mCounter++){ - if(mCurrentList.get(mCounter).getHeader().equals(CONST_HISTORY_LOAD_MORE)){ - int finalM_counter = mCounter; - mContext.runOnUiThread(() -> { - mCurrentList.remove(finalM_counter); - notifyItemRemoved(finalM_counter); - }); - break; - } - } + public void onLoadMore(ArrayList pModelList){ + notifyDataSetChanged(); + initializeModelWithDate(false); } @@ -120,7 +104,7 @@ public class historyAdapter extends RecyclerView.Adapter1){ - new Thread(){ - public void run(){ - try - { - sleep(500); - } - catch (InterruptedException e) - { - e.printStackTrace(); - } - } - }.start(); + notifyItemRemoved(pIndex); + notifyItemRangeChanged(pIndex, mCurrentList.size()); + notifyItemChanged(mCurrentList.size()-1); } } @@ -446,6 +417,7 @@ public class historyAdapter extends RecyclerView.Adapter6){ + break; + } + } + mContext.runOnUiThread(() -> mFaviconLogo.setImageDrawable(mHindTypeIconTemp.getDrawable())); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + }.start(); setItemViewOnClickListener(mRowContainer, mRowMenu, mDescription.getText().toString(), p_position, header, mRowMenu, mLogoImage, model.getID(), model.getDate()); } @@ -537,12 +533,6 @@ public class historyAdapter extends RecyclerView.Adapter model = (ArrayList) dataController.getInstance().invokeHistory(dataEnums.eHistoryCommands.M_GET_HISTORY ,null); + mHistoryModel.setList(model); + activityContextManager.getInstance().getHistoryController().runOnUiThread(() -> { + if(mPrevSize mHistoryAdapter.onTrigger(historyEnums.eHistoryAdapterCommands.M_LOADING_CLEAR, null)); - sleep(1000); isUpdatingRecyclerView = false; } catch (InterruptedException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyEnums.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyEnums.java index 3dc9d439..a88f5e86 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyEnums.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyEnums.java @@ -8,7 +8,7 @@ public class historyEnums } public enum eHistoryAdapterCommands { - M_ON_LOADING, M_LOADING_CLEAR, M_CLEAR_LONG_SELECTED_URL, GET_SELECTED_URL, GET_LONG_SELECTED_URL, GET_LONG_SELECTED_STATUS, ON_CLOSE + M_CLEAR_LONG_SELECTED_URL, GET_SELECTED_URL, GET_LONG_SELECTED_URL, GET_LONG_SELECTED_STATUS, ON_CLOSE } public enum eHistoryViewAdapterCommands { diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoClients.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoClients.java index 4efbcfa4..1f2a1285 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoClients.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoClients.java @@ -7,6 +7,8 @@ import android.widget.ImageView; import androidx.appcompat.app.AppCompatActivity; import com.darkweb.genesissearchengine.appManager.kotlinHelperLibraries.BrowserIconManager; import com.darkweb.genesissearchengine.constants.*; +import com.darkweb.genesissearchengine.dataManager.dataController; +import com.darkweb.genesissearchengine.dataManager.dataEnums; import com.darkweb.genesissearchengine.helperManager.eventObserver; import com.darkweb.genesissearchengine.helperManager.helperMethod; @@ -185,7 +187,8 @@ public class geckoClients if(url.startsWith("https://boogle.store?pG") || url.endsWith("boogle.store") || url.endsWith(constants.CONST_GENESIS_DOMAIN_URL_SLASHED)){ try{ mSession.initURL(constants.CONST_GENESIS_DOMAIN_URL); - mSession.loadUri(constants.CONST_GENESIS_URL_CACHED); + String mURL = constants.CONST_GENESIS_URL_CACHED + "?pData="+ dataController.getInstance().invokeReferenceWebsite(dataEnums.eReferenceWebsiteCommands.M_FETCH,null); + mSession.loadUri(mURL); }catch (Exception ex){ ex.printStackTrace(); } diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoSession.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoSession.java index 72f2e81a..c7990fc2 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoSession.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoSession.java @@ -60,6 +60,7 @@ import java.util.Objects; import javax.crypto.spec.SecretKeySpec; +import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_URL_CACHED; 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; @@ -82,6 +83,7 @@ public class geckoSession extends GeckoSession implements GeckoSession.MediaDele private AppCompatActivity mContext; private geckoDownloadManager mDownloadManager; private String mTheme = null; + private boolean mPreviousErrorPage = false; /*Temp Variables*/ private GeckoSession.HistoryDelegate.HistoryList mHistoryList = null; @@ -304,7 +306,7 @@ public class geckoSession extends GeckoSession implements GeckoSession.MediaDele if(!mCurrentTitle.equals("loading")){ m_current_url_id = (int)event.invokeObserver(Arrays.asList(mCurrentURL,mSessionID,mCurrentTitle, m_current_url_id, mTheme, this), enums.etype.on_update_history); } - if(newUrl.equals(constants.CONST_GENESIS_URL_CACHED)){ + if(newUrl.startsWith(CONST_GENESIS_URL_CACHED)){ mCurrentURL = constants.CONST_GENESIS_DOMAIN_URL; } else if(newUrl.equals(constants.CONST_GENESIS_HELP_URL_CACHE)){ @@ -330,8 +332,8 @@ public class geckoSession extends GeckoSession implements GeckoSession.MediaDele } public GeckoResult onLoadRequest(@NonNull GeckoSession var2, @NonNull GeckoSession.NavigationDelegate.LoadRequest var1) { - - if(!var1.uri.equals(constants.CONST_GENESIS_URL_CACHED) && var1.uri.startsWith("https://boogle.store") && !var1.uri.contains(constants.CONST_GENESIS_LOCAL_TIME_GET_KEY) && !var1.uri.contains(constants.CONST_GENESIS_LOCAL_TIME_GET_KEY)){ + mPreviousErrorPage = false; + if(!var1.uri.startsWith(CONST_GENESIS_URL_CACHED) && var1.uri.startsWith("https://boogle.store") && !var1.uri.contains(constants.CONST_GENESIS_LOCAL_TIME_GET_KEY) && !var1.uri.contains(constants.CONST_GENESIS_LOCAL_TIME_GET_KEY)){ String mVerificationURL = setGenesisVerificationToken(var1.uri); initURL(mVerificationURL); loadUri(mVerificationURL); @@ -348,6 +350,7 @@ public class geckoSession extends GeckoSession implements GeckoSession.MediaDele } else if(var1.uri.equals("about:blank") && mIsLoaded){ event.invokeObserver(Arrays.asList(mCurrentURL,mSessionID,mCurrentTitle, mTheme), enums.etype.ON_EXPAND_TOP_BAR); + event.invokeObserver(Arrays.asList(mCurrentURL,mSessionID,mCurrentTitle, false), enums.etype.M_ON_BANNER_UPDATE); return GeckoResult.fromValue(AllowOrDeny.ALLOW); } else if(var1.target==2){ @@ -356,7 +359,7 @@ public class geckoSession extends GeckoSession implements GeckoSession.MediaDele } else if(!var1.uri.equals("about:blank")){ mCurrentURL = var1.uri; - if(mCurrentURL.equals(constants.CONST_GENESIS_URL_CACHED)){ + if(mCurrentURL.startsWith(CONST_GENESIS_URL_CACHED)){ mCurrentURL = constants.CONST_GENESIS_DOMAIN_URL; }else if(mCurrentURL.equals(constants.CONST_GENESIS_HELP_URL_CACHE)){ mCurrentURL = constants.CONST_GENESIS_HELP_URL; @@ -366,6 +369,7 @@ public class geckoSession extends GeckoSession implements GeckoSession.MediaDele event.invokeObserver(Arrays.asList(mCurrentURL,mSessionID), enums.etype.search_update); checkApplicationRate(); event.invokeObserver(Arrays.asList(mCurrentURL,mSessionID,mCurrentTitle, mTheme), enums.etype.ON_EXPAND_TOP_BAR); + return GeckoResult.fromValue(AllowOrDeny.ALLOW); }else { return GeckoResult.fromValue(AllowOrDeny.DENY); @@ -388,6 +392,7 @@ public class geckoSession extends GeckoSession implements GeckoSession.MediaDele public GeckoResult onLoadError(@NonNull GeckoSession var1, @Nullable String var2, WebRequestError var3) { errorHandler handler = new errorHandler(); mProgress = 0; + mPreviousErrorPage = true; event.invokeObserver(Arrays.asList(var2,mSessionID), enums.etype.on_load_error); event.invokeObserver(Arrays.asList(mCurrentURL,mSessionID,mCurrentTitle, mTheme), enums.etype.ON_UPDATE_THEME); return GeckoResult.fromValue("data:text/html," + handler.createErrorPage(var3.category, var3.code,mContext,var2)); @@ -408,6 +413,13 @@ public class geckoSession extends GeckoSession implements GeckoSession.MediaDele @UiThread public void onFirstContentfulPaint(@NonNull GeckoSession var1) { isFirstPaintExecuted = true; + + if(mPreviousErrorPage || mCurrentURL.contains("boogle.store") || mCurrentURL.startsWith(CONST_GENESIS_URL_CACHED)){ + event.invokeObserver(Arrays.asList(mCurrentURL,mSessionID,mCurrentTitle, false), enums.etype.M_ON_BANNER_UPDATE); + }else { + event.invokeObserver(Arrays.asList(mCurrentURL,mSessionID,mCurrentTitle, true), enums.etype.M_ON_BANNER_UPDATE); + } + if(!mCurrentURL.equals("about:blank")){ event.invokeObserver(Arrays.asList(mCurrentURL,mSessionID,mCurrentTitle, m_current_url_id,mTheme), enums.etype.ON_FIRST_PAINT); event.invokeObserver(Arrays.asList(mCurrentURL,mSessionID,mCurrentTitle, m_current_url_id,mTheme), enums.etype.ON_LOAD_REQUEST); diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeController.java index 2041bcd0..578a3977 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeController.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeController.java @@ -438,6 +438,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba /*-------------------------------------------------------Helper Methods-------------------------------------------------------*/ public void onGetFavIcon(ImageView pImageView, String pURL){ + mGeckoClient.onGetFavIcon(pImageView, pURL); } public void onGetThumbnail(ImageView pImageView){ @@ -1422,9 +1423,13 @@ public class homeController extends AppCompatActivity implements ComponentCallba @Override public Object invokeObserver(List data, Object e_type) { + if(e_type.equals(enums.etype.ON_EXPAND_TOP_BAR)){ mAppBar.setExpanded(true,true); } + else if(e_type.equals(enums.etype.M_ON_BANNER_UPDATE)){ + mHomeViewController.updateBannerAdvertStatus((boolean)data.get(3)); + } else if(e_type.equals(enums.etype.progress_update)){ mHomeViewController.onProgressBarUpdate((int)data.get(0)); } diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeViewController.java index dd8cd80a..3d741ffa 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeViewController.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeViewController.java @@ -54,6 +54,7 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.Callable; import static android.content.Context.LAYOUT_INFLATER_SERVICE; +import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eAdManagerCallbacks.M_SHOW_LOADED_ADS; import static org.mozilla.geckoview.GeckoSessionSettings.USER_AGENT_MODE_DESKTOP; class homeViewController @@ -145,6 +146,8 @@ class homeViewController { mContext.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_USER); }, 1500); + + updateBannerAdvertStatus(false); } public void initTopBarPadding(){ @@ -560,6 +563,20 @@ class homeViewController } } + void updateBannerAdvertStatus(boolean status){ + if(status){ + mBannerAds.animate().cancel(); + mBannerAds.setAlpha(0); + mBannerAds.animate().alpha(1); + mBannerAds.setVisibility(View.VISIBLE); + onSetBannerAdMargin(true,true); + }else{ + mBannerAds.animate().cancel(); + mBannerAds.animate().alpha(0).withEndAction(() -> mBannerAds.setVisibility(View.GONE)); + onSetBannerAdMargin(false,true); + } + } + private Handler searchBarUpdateHandler = new Handler(); private String handlerLocalUrl = ""; void onUpdateSearchBar(String url,boolean showProtocol, boolean pClearText){ diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/logManager/settingLogController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/logManager/settingLogController.java index 4699620c..f8a45e90 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/logManager/settingLogController.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/logManager/settingLogController.java @@ -37,6 +37,7 @@ public class settingLogController extends AppCompatActivity { pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_ACTIVITY_CREATED); super.onCreate(savedInstanceState); setContentView(R.layout.setting_log_view); + activityContextManager.getInstance().onStack(this); viewsInitializations(); } diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabViewController.java index cda22199..1dadf53b 100755 --- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabViewController.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabViewController.java @@ -150,7 +150,7 @@ class tabViewController mRemoveSelection.setVisibility(View.GONE); mClearSelection.setVisibility(View.GONE); mMenuButton.setVisibility(View.VISIBLE); - mTabs.animate().setStartDelay(350).setDuration(200).alpha(1); + mTabs.animate().setStartDelay(0).setDuration(250).alpha(1); } private void onShowUndoDialog(int pTabCount) { diff --git a/app/src/main/java/com/darkweb/genesissearchengine/constants/constants.java b/app/src/main/java/com/darkweb/genesissearchengine/constants/constants.java index 6c0cfbc0..73a8b5ca 100755 --- a/app/src/main/java/com/darkweb/genesissearchengine/constants/constants.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/constants.java @@ -19,6 +19,7 @@ public class constants public static final String CONST_GENESIS_URL_CACHED = "resource://android/assets/homepage/homepage.html"; public static final String CONST_GENESIS_ERROR_CACHED = "resource://android/assets/error/error.html"; public static final String CONST_GENESIS_DOMAIN_URL_SLASHED = "https://boogle.store/"; + public static final String CONST_GENESIS_REFERENCE_WEBSITES = "https://drive.google.com/uc?export=download&id=1lOmukKOPYHApBFyTDkaRPoAwm59E_YEE"; public static final String CONST_GENESIS_DOMAIN_URL = "https://boogle.store"; public static final String CONST_GENESIS_LOCAL_TIME_GET_KEY = "pLocalTimeVerificationToken"; public static final String CONST_GENESIS_GMT_TIME_GET_KEY = "pGlobalTimeVerificationToken"; diff --git a/app/src/main/java/com/darkweb/genesissearchengine/constants/enums.java b/app/src/main/java/com/darkweb/genesissearchengine/constants/enums.java index 3cca1d0d..d87a297e 100755 --- a/app/src/main/java/com/darkweb/genesissearchengine/constants/enums.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/enums.java @@ -6,7 +6,7 @@ public class enums public enum etype{ on_update_favicon,ON_UPDATE_TAB_TITLE, ON_LOAD_REQUEST,GECKO_SCROLL_CHANGED,ON_UPDATE_SEARCH_BAR, on_verify_selected_url_menu,FINDER_RESULT_CALLBACK, - welcome, reload,download_folder, + welcome, reload,download_folder,M_ON_BANNER_UPDATE, url_triggered, url_triggered_new_tab,url_clear,fetch_favicon, fetch_thumbnail,url_clear_at,remove_from_database,is_empty,M_HOME_PAGE,M_PRELOAD_URL,ON_KEYBOARD_CLOSE, on_close_sesson,on_long_press, on_full_screen,on_handle_external_intent,on_update_suggestion_url,progress_update, ON_EXPAND_TOP_BAR,recheck_orbot,on_url_load,on_playstore_load,back_list_empty,start_proxy, ON_UPDATE_THEME, M_INITIALIZE_TAB_SINGLE, M_INITIALIZE_TAB_LINK,on_request_completed, on_update_history,on_update_suggestion,M_WELCOME_MESSAGE,ON_UPDATE_TITLE_BAR,ON_FIRST_PAINT, ON_LOAD_TAB_ON_RESUME, ON_SESSION_REINIT,on_page_loaded,on_load_error,download_file_popup,on_init_ads,search_update, open_new_tab } 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 7eb8082a..2ea9c5c5 100755 --- a/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java @@ -5,6 +5,7 @@ public class keys /*Home page*/ public static String HOME_LOW_MEMORY = "LOW_MEMORY"; + public static final String HOME_REFERENCE_WEBSITES = "HOME_REFERENCE_WEBSITES"; /*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 01824fcf..9ca0efac 100755 --- a/app/src/main/java/com/darkweb/genesissearchengine/constants/status.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/status.java @@ -23,6 +23,7 @@ public class status public static String sSettingRedirectStatus = strings.GENERIC_EMPTY_STR; public static String sSettingLanguage = "en"; public static String sSettingLanguageRegion = "Us"; + public static String mReferenceWebsites; public static boolean sSettingEnableZoom = true; public static boolean sSettingEnableVoiceInput = true; @@ -87,8 +88,9 @@ public class status status.sStatusDoNotTrack = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.SETTING_DONOT_TRACK,true)); status.sSettingCookieStatus = (int)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_INT, Arrays.asList(keys.SETTING_COOKIE_ADJUSTABLE,ACCEPT_FIRST_PARTY)); status.sSettingFontSize = (int)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_FLOAT, Arrays.asList(keys.SETTING_FONT_SIZE,100)); + status.mReferenceWebsites = (String)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_STRING, Arrays.asList(keys.SETTING_LANGUAGE,strings.SETTING_DEFAULT_LANGUAGE)); - status.sSettingLanguage = (String)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_STRING, Arrays.asList(keys.SETTING_LANGUAGE,strings.SETTING_DEFAULT_LANGUAGE)); + status.sSettingLanguage = (String)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_STRING, Arrays.asList(keys.HOME_REFERENCE_WEBSITES,strings.HOME_REFERENCE_WEBSITES_DEFAULT)); status.sSettingLanguageRegion = (String)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_STRING, Arrays.asList(keys.SETTING_LANGUAGE_REGION,strings.SETTING_DEFAULT_LANGUAGE_REGION)); status.sSettingSearchStatus = (String)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_STRING, Arrays.asList(keys.SETTING_SEARCH_ENGINE,constants.CONST_BACKEND_GENESIS_URL)); status.sBridgeCustomBridge = (String)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_STRING, Arrays.asList(keys.BRIDGE_CUSTOM_BRIDGE_1,strings.BRIDGE_CUSTOM_BRIDGE_OBFS4)); 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 2e66dc7c..47c67f82 100755 --- a/app/src/main/java/com/darkweb/genesissearchengine/constants/strings.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/strings.java @@ -46,6 +46,7 @@ public class strings /*Home Manager*/ public static final String HOME_BLANK_PAGE = "about:blank"; + public static final String HOME_REFERENCE_WEBSITES_DEFAULT = ""; /*Message Manager*/ diff --git a/app/src/main/java/com/darkweb/genesissearchengine/dataManager/dataController.java b/app/src/main/java/com/darkweb/genesissearchengine/dataManager/dataController.java index bb4b92c2..834ccfff 100755 --- a/app/src/main/java/com/darkweb/genesissearchengine/dataManager/dataController.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/dataManager/dataController.java @@ -24,6 +24,7 @@ public class dataController private bookmarkDataModel mBookmarkDataModel; private suggestionDataModel mSuggestionDataModel; private helpDataModel mHelpDataModel; + private referenceWebsiteDataModel mReferenceWebsiteDataModel; /*Private Declarations*/ @@ -43,8 +44,10 @@ public class dataController mBookmarkDataModel = new bookmarkDataModel(); mSuggestionDataModel = new suggestionDataModel(pAppContext); mHelpDataModel = new helpDataModel(); + mReferenceWebsiteDataModel = new referenceWebsiteDataModel(); } public void initializeListData(){ + mReferenceWebsiteDataModel.onTrigger(dataEnums.eReferenceWebsiteCommands.M_LOAD,Collections.singletonList(activityContextManager.getInstance().getHomeController())); mBookmarkDataModel.initializebookmark(databaseController.getInstance().selectBookmark()); if(!status.sClearOnExit) { @@ -69,7 +72,7 @@ public class dataController } if(pCommands.equals(dataEnums.eHistoryCommands.M_LOAD_MORE_HISTORY)){ - int m_history_size = (int) mHistoryModel.onTrigger(dataEnums.eHistoryCommands.M_HISTORY_SIZE,null); + int m_history_size = (int) mHistoryModel.onTrigger(dataEnums.eHistoryCommands.M_HISTORY_SIZE,null) - 1; return mHistoryModel.onTrigger(pCommands, Collections.singletonList(databaseController.getInstance().selectHistory(m_history_size+1,constants.CONST_FETCHABLE_LIST_SIZE))); }else { return mHistoryModel.onTrigger(pCommands, pData); @@ -80,6 +83,10 @@ public class dataController return mSuggestionDataModel.onTrigger(pCommands, Arrays.asList(pData.get(0), mHistoryModel.onTrigger(dataEnums.eHistoryCommands.M_GET_HISTORY, null), mBookmarkDataModel.onTrigger(dataEnums.eBookmarkCommands.M_GET_BOOKMARK, null))); } + public Object invokeReferenceWebsite(dataEnums.eReferenceWebsiteCommands pCommands, List pData){ + return mReferenceWebsiteDataModel.onTrigger(pCommands, null); + } + /*Recieving Preferences*/ public Object invokePrefs(dataEnums.ePreferencesCommands pCommands, List pData){ return mPreferenceModel.onTrigger(pCommands, pData); diff --git a/app/src/main/java/com/darkweb/genesissearchengine/dataManager/dataEnums.java b/app/src/main/java/com/darkweb/genesissearchengine/dataManager/dataEnums.java index 9b74bda4..5f7b4e94 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/dataManager/dataEnums.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/dataManager/dataEnums.java @@ -11,6 +11,10 @@ public class dataEnums M_ADD_BOOKMARK, M_GET_BOOKMARK, M_DELETE_BOOKMARK, M_CLEAR_BOOKMARK; } + public enum eReferenceWebsiteCommands { + M_LOAD, M_FETCH; + } + public enum ePreferencesCommands{ M_SET_STRING, M_SET_BOOL, M_SET_INT, M_SET_FLOAT, M_GET_STRING, M_GET_BOOL, M_GET_INT, M_GET_FLOAT, M_CLEAR_PREFS } diff --git a/app/src/main/java/com/darkweb/genesissearchengine/dataManager/referenceWebsiteDataModel.java b/app/src/main/java/com/darkweb/genesissearchengine/dataManager/referenceWebsiteDataModel.java new file mode 100644 index 00000000..72ee1f97 --- /dev/null +++ b/app/src/main/java/com/darkweb/genesissearchengine/dataManager/referenceWebsiteDataModel.java @@ -0,0 +1,56 @@ +package com.darkweb.genesissearchengine.dataManager; + +import android.content.Context; +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 java.util.List; +import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_REFERENCE_WEBSITES; + +public class referenceWebsiteDataModel { + + private String mReferenceWebsiteData = "null"; + private boolean mLoading = false; + + public referenceWebsiteDataModel(){ + mReferenceWebsiteData = status.mReferenceWebsites; + } + + private void onLoad(Context pContext){ + if(!mLoading){ + mLoading = true; + + StringRequest stringRequest = new StringRequest(Request.Method.GET, CONST_GENESIS_REFERENCE_WEBSITES, + response -> { + mReferenceWebsiteData = response; + mLoading = false; + }, + error -> {}); + + RequestQueue requestQueue = Volley.newRequestQueue(pContext); + requestQueue.add(stringRequest); + } + } + + private String onFetch(){ + try { + return mReferenceWebsiteData; + }catch (Exception ignored){} + return strings.GENERIC_EMPTY_SPACE; + } + + public Object onTrigger(dataEnums.eReferenceWebsiteCommands p_commands, List pData){ + if(p_commands == dataEnums.eReferenceWebsiteCommands.M_LOAD){ + onLoad((Context) pData.get(0)); + } + if(p_commands == dataEnums.eReferenceWebsiteCommands.M_FETCH){ + return onFetch(); + } + + return null; + } + +} 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 307842cf..c767146a 100755 --- a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/adManager.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/adManager.java @@ -64,10 +64,6 @@ class adManager @Override public void onAdLoaded() { bannerAdsLoaded = true; - mBannerAds.animate().cancel(); - mBannerAds.animate().alpha(0); - mBannerAds.setVisibility(View.VISIBLE); - mBannerAds.animate().setStartDelay(100).setDuration(500).alpha(1).withEndAction(() -> mEvent.invokeObserver(null,M_SHOW_LOADED_ADS)); } @Override diff --git a/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml b/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml index 5adfa16a..c2a11708 100644 --- a/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml +++ b/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml @@ -173,8 +173,7 @@ 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 943c3e4b..3ce5e6a0 100644 --- a/app/src/main/res/layouts/history/layout/history_view.xml +++ b/app/src/main/res/layouts/history/layout/history_view.xml @@ -135,7 +135,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/c_background" - android:orientation="horizontal" + android:orientation="vertical" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -143,8 +143,9 @@