diff --git a/app/build.gradle b/app/build.gradle index f10cb4da..8aaefbcc 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -115,7 +115,7 @@ dependencies { /* Helper Libraries */ - implementation 'androidx.appcompat:appcompat:1.6.0' + implementation 'androidx.appcompat:appcompat:1.6.1' implementation "androidx.media:media:1.6.0" implementation 'com.android.volley:volley:1.2.1' implementation "net.zetetic:android-database-sqlcipher:4.4.3" diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/delegateModel/historyDelegate.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/delegateModel/historyDelegate.java index 4ee46365..f2a7fdd6 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/delegateModel/historyDelegate.java +++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/delegateModel/historyDelegate.java @@ -48,16 +48,16 @@ public class historyDelegate implements GeckoSession.HistoryDelegate { } mHistory = var2; if(mHistory !=null){ - if(mHistoryChanged){ - if(!mHistory.get(mHistory.getCurrentIndex()).getUri().equals("about:blank")){ - setURL(mHistory.get(mHistory.getCurrentIndex()).getUri()); - } - } - mEvent.invokeObserver(Arrays.asList(mHistory, mGeckoDataModel.mSessionID), homeEnums.eGeckoCallback.ON_URL_LOAD); - if(mCurrentIndex != var2.getCurrentIndex() && mHistoryChanged){ - mEvent.invokeObserver(Arrays.asList(mGeckoDataModel.mCurrentURL, mGeckoDataModel.mSessionID, mHistory.get(mHistory.getCurrentIndex()).getTitle(), mGeckoDataModel.mCurrentURL_ID, mGeckoDataModel.mTheme, mGeckoSession), homeEnums.eGeckoCallback.ON_UPDATE_SEARCH_BAR); - } try { + if(mHistoryChanged){ + if(!mHistory.get(mHistory.getCurrentIndex()).getUri().equals("about:blank")){ + setURL(mHistory.get(mHistory.getCurrentIndex()).getUri()); + } + } + mEvent.invokeObserver(Arrays.asList(mHistory, mGeckoDataModel.mSessionID), homeEnums.eGeckoCallback.ON_URL_LOAD); + if(mCurrentIndex != var2.getCurrentIndex() && mHistoryChanged){ + mEvent.invokeObserver(Arrays.asList(mGeckoDataModel.mCurrentURL, mGeckoDataModel.mSessionID, mHistory.get(mHistory.getCurrentIndex()).getTitle(), mGeckoDataModel.mCurrentURL_ID, mGeckoDataModel.mTheme, mGeckoSession), homeEnums.eGeckoCallback.ON_UPDATE_SEARCH_BAR); + } Object mID = mEvent.invokeObserver(Arrays.asList(mGeckoDataModel.mCurrentURL, mGeckoDataModel.mSessionID, mHistory.get(mHistory.getCurrentIndex()).getTitle(), -1, mGeckoDataModel.mTheme, mGeckoSession, false), homeEnums.eGeckoCallback.ON_UPDATE_HISTORY); if (mID != null) { mGeckoDataModel.mCurrentURL_ID = (int) mID; diff --git a/build.gradle b/build.gradle index a353b6b9..b3208fba 100755 --- a/build.gradle +++ b/build.gradle @@ -14,9 +14,9 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.google.gms:google-services:4.3.15' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0" classpath "com.applovin.quality:AppLovinQualityServiceGradlePlugin:+" } } diff --git a/build/kotlin/sessions/kotlin-compiler-7108739812455400130.salive b/build/kotlin/sessions/kotlin-compiler-7108739812455400130.salive new file mode 100644 index 00000000..e69de29b diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c0f9ea4c..7eb624d4 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip