diff --git a/.idea/misc.xml b/.idea/misc.xml index ea5b2ba5..76521545 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -64,10 +64,11 @@ + - + diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/externalCommandManager/externalShortcutController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/externalCommandManager/externalShortcutController.java index 088e4816..a624e382 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/appManager/externalCommandManager/externalShortcutController.java +++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/externalCommandManager/externalShortcutController.java @@ -53,8 +53,8 @@ public class externalShortcutController extends AppCompatActivity { /* Start Required Activity */ - finish(); helperMethod.openIntent(mIntent, this, constants.CONST_LIST_EXTERNAL_SHORTCUT); + } /* UI TRIGGERS */ diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/externalCommandManager/externalURLNavigationContoller.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/externalCommandManager/externalURLNavigationContoller.java index fa80d06f..f69336f9 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/appManager/externalCommandManager/externalURLNavigationContoller.java +++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/externalCommandManager/externalURLNavigationContoller.java @@ -2,6 +2,8 @@ package com.hiddenservices.onionservices.appManager.externalCommandManager; import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION; +import android.app.ActivityManager; +import android.app.PendingIntent; import android.content.Intent; import android.net.Uri; import android.os.Build; @@ -61,12 +63,23 @@ public class externalURLNavigationContoller extends AppCompatActivity { } else { - Intent intent = new Intent(this, homeController.class); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_SINGLE_TOP); - intent.addFlags(FLAG_ACTIVITY_NO_ANIMATION); - startActivity(intent); + finish(); - activityContextManager.getInstance().getHomeController().onExternalURLInvoke(mData.toString()); + Uri finalMData1 = mData; + helperMethod.onDelayHandler(this, 100, () -> { + activityContextManager.getInstance().getHomeController().onExternalURLInvoke(finalMData1.toString()); + return null; + }); + + helperMethod.onDelayHandler(this, 500, () -> { + Intent intent = new Intent(this, homeController.class); + intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); + intent.addFlags(FLAG_ACTIVITY_NO_ANIMATION); + startActivity(intent); + return null; + }); + + return; } } diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/NestedGeckoView.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/NestedGeckoView.java index 19563ce8..b9e14fab 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/NestedGeckoView.java +++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/NestedGeckoView.java @@ -108,7 +108,7 @@ public class NestedGeckoView extends GeckoView { mScrollable = true; } - final boolean allowScroll = status.sFullScreenBrowsing && !status.sDisableExpandTemp && (mScrollOffsetRoot>0 && mScrollable || mForcedScroll || mBottomReached); + final boolean allowScroll = status.sFullScreenBrowsing && (mScrollOffsetRoot>0 && mScrollable || mForcedScroll || mBottomReached); if (allowScroll && dispatchNestedPreScroll(0, deltaY, mScrollConsumed, mScrollOffset)) { diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeController.java index f9fb8e1f..9833791b 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeController.java +++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeController.java @@ -1136,7 +1136,11 @@ public class homeController extends AppCompatActivity implements ComponentCallba pluginController.getInstance().onAdsInvoke(Collections.singletonList(this), pluginEnums.eAdManager.M_INITIALIZE_BANNER_ADS); mGeckoClient.getSession().setTheme(null); mHomeViewController.onUpdateStatusBarTheme(mGeckoClient.getTheme(), true); - mHomeViewController.onNewTabAnimation(Collections.singletonList(helperMethod.getDomainName(mHomeModel.getSearchEngine())), M_HOME_BUTTON_PRESSED); + if(status.sSettingDefaultSearchEngine.equals(constants.CONST_BACKEND_GENESIS_URL)){ + mHomeViewController.onNewTabAnimation(Collections.singletonList(helperMethod.getDomainName(mHomeModel.getSearchEngine())), M_HOME_BUTTON_PRESSED); + }else { + onLoadURL(helperMethod.getHost(status.sSettingDefaultSearchEngine)); + } } /*TAB CONTROLLER EVENTS*/ diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/orbotLogManager/orbotLogAdapter.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/orbotLogManager/orbotLogAdapter.java index 69391643..43bf5add 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/appManager/orbotLogManager/orbotLogAdapter.java +++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/orbotLogManager/orbotLogAdapter.java @@ -1,5 +1,6 @@ package com.hiddenservices.onionservices.appManager.orbotLogManager; +import android.content.Intent; import android.net.Uri; import android.view.LayoutInflater; import android.view.View; @@ -12,11 +13,8 @@ import com.hiddenservices.onionservices.appManager.activityContextManager; import com.hiddenservices.onionservices.appManager.tabManager.tabEnums; import com.hiddenservices.onionservices.constants.constants; import com.hiddenservices.onionservices.eventObserver; -import com.hiddenservices.onionservices.helperManager.helperMethod; import com.example.myapplication.R; - import org.orbotproject.android.service.wrapper.logRowModel; - import java.util.ArrayList; import java.util.List; @@ -65,14 +63,17 @@ public class orbotLogAdapter extends RecyclerView.Adapter pData, Object pType) + { + if(pType.equals(orbotLogEnums.eOrbotLogAdapterCommands.M_CLOSE)){ + helperMethod.onDelayHandler(orbotLogController.this, 500, () -> { + finish(); + return null; + }); + } + return null; + } + } + /* Model Callback */ public class orbotModelCallback implements eventObserver.eventListener{ diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/orbotLogManager/orbotLogEnums.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/orbotLogManager/orbotLogEnums.java index dc74e9a3..22a92dd4 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/appManager/orbotLogManager/orbotLogEnums.java +++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/orbotLogManager/orbotLogEnums.java @@ -19,4 +19,10 @@ public class orbotLogEnums public enum eOrbotLogModelCallbackCommands { M_UPDATE_FLOATING_BUTTON, M_UPDATE_LOGS, M_UPDATE_RECYCLE_VIEW } + + /*Orbot Log Model Manager*/ + public enum eOrbotLogAdapterCommands { + M_CLOSE + } + } \ No newline at end of file diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/orbotLogManager/orbotLogModel.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/orbotLogManager/orbotLogModel.java index 835ec0ef..59c3caed 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/appManager/orbotLogManager/orbotLogModel.java +++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/orbotLogManager/orbotLogModel.java @@ -92,7 +92,6 @@ class orbotLogModel runOnUiThread(() -> { if(orbotLocalConstants.mTorLogsHistory.size()>mLogCounter){ mModelList.add(orbotLocalConstants.mTorLogsHistory.get(mLogCounter)); - Log.i("asdasd : ",orbotLocalConstants.mTorLogsHistory.get(mLogCounter).getLog()); if(!status.sLogThemeStyleAdvanced){ mEvent.invokeObserver(Collections.singletonList(mLogCounter), M_UPDATE_LOGS); }else { diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/settingHomeManager/settingHomeController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/settingHomeManager/settingHomeController.java index 633556ae..1ef9f3bd 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/settingHomeManager/settingHomeController.java +++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/settingHomeManager/settingHomeController.java @@ -28,6 +28,7 @@ import com.hiddenservices.onionservices.dataManager.dataEnums; import com.hiddenservices.onionservices.eventObserver; import com.hiddenservices.onionservices.helperManager.helperMethod; import com.hiddenservices.onionservices.appManager.activityThemeManager; +import com.hiddenservices.onionservices.libs.trueTime.trueTimeEncryption; import com.hiddenservices.onionservices.pluginManager.pluginController; import com.hiddenservices.onionservices.pluginManager.pluginEnums; import com.example.myapplication.R; @@ -241,7 +242,7 @@ public class settingHomeController extends AppCompatActivity public void onReportWebsite(View view) { try { finish(); - activityContextManager.getInstance().getHomeController().onLoadURL(constants.CONST_REPORT_URL + URLEncoder.encode(activityContextManager.getInstance().getHomeController().onGetCurrentURL(), "UTF-8")); + activityContextManager.getInstance().getHomeController().onLoadURL(helperMethod.setGenesisVerificationToken(constants.CONST_REPORT_URL + URLEncoder.encode(activityContextManager.getInstance().getHomeController().onGetCurrentURL(), "UTF-8"))); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } @@ -249,12 +250,12 @@ public class settingHomeController extends AppCompatActivity public void onSitemap(View view) { finish(); - activityContextManager.getInstance().getHomeController().onLoadURL(constants.CONST_SITEMAP); + activityContextManager.getInstance().getHomeController().onLoadURL(helperMethod.setGenesisVerificationToken(constants.CONST_SITEMAP)); } public void onPrivacyPolicy(View view) { finish(); - activityContextManager.getInstance().getHomeController().onLoadURL(constants.CONST_PRIVACY_POLICY_URL); + activityContextManager.getInstance().getHomeController().onLoadURL(helperMethod.setGenesisVerificationToken(constants.CONST_PRIVACY_POLICY_URL)); } public void onRateApplication(View view) { diff --git a/app/src/main/java/com/hiddenservices/onionservices/constants/constants.java b/app/src/main/java/com/hiddenservices/onionservices/constants/constants.java index 6e15a6de..b275db1c 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/constants/constants.java +++ b/app/src/main/java/com/hiddenservices/onionservices/constants/constants.java @@ -11,7 +11,7 @@ public class constants public static final String CONST_PRIVACY_POLICY_URL = "http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/privacy"; public static final String CONST_REPORT_URL = "http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/report?url="; - public static final String CONST_SITEMAP = "http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/create"; + public static final String CONST_SITEMAP = "http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/sitemap"; public static final String CONST_PACKAGE_NAME = "com.hiddenservices.onionservices"; public static final String CONST_GENESIS_ONION = "genesis.onion"; public static final String CONST_GENESIS_ONION_V2 = "trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion"; diff --git a/app/src/main/java/com/hiddenservices/onionservices/helperManager/helperMethod.java b/app/src/main/java/com/hiddenservices/onionservices/helperManager/helperMethod.java index 0d210c5f..4e6e8033 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/helperManager/helperMethod.java +++ b/app/src/main/java/com/hiddenservices/onionservices/helperManager/helperMethod.java @@ -55,9 +55,11 @@ import androidx.core.graphics.ColorUtils; import com.hiddenservices.onionservices.appManager.homeManager.geckoManager.geckoSession; import com.hiddenservices.onionservices.appManager.kotlinHelperLibraries.defaultBrowser; +import com.hiddenservices.onionservices.constants.constants; import com.hiddenservices.onionservices.constants.enums; import com.hiddenservices.onionservices.constants.keys; import com.hiddenservices.onionservices.constants.strings; +import com.hiddenservices.onionservices.libs.trueTime.trueTimeEncryption; import com.hiddenservices.onionservices.pluginManager.pluginController; import com.example.myapplication.R; @@ -139,6 +141,19 @@ public class helperMethod return pendingIntent; } + public static String setGenesisVerificationToken(String pString){ + try{ + if (pString.contains("?")){ + pString += "&"+ constants.CONST_GENESIS_GMT_TIME_GET_KEY+"="+ trueTimeEncryption.getInstance().getSecretToken(); + }else { + pString += "?"+constants.CONST_GENESIS_GMT_TIME_GET_KEY+"="+trueTimeEncryption.getInstance().getSecretToken(); + } + return pString; + }catch (Exception ex){ + return pString; + } + } + public static int getResId(String resName, Class c) { try { @@ -420,7 +435,7 @@ public class helperMethod selectorIntent.setData(Uri.parse("mailto:")); final Intent emailIntent = new Intent(Intent.ACTION_SEND); - emailIntent.putExtra(Intent.EXTRA_EMAIL, new String[]{"gamesolstudios@gmail.com"}); + emailIntent.putExtra(Intent.EXTRA_EMAIL, new String[]{"genesishiddentechnologies@gmail.com"}); emailIntent.putExtra(Intent.EXTRA_SUBJECT, "Issue Report"); emailIntent.putExtra(Intent.EXTRA_TEXT, "Write Message Here...."); emailIntent.setSelector( selectorIntent ); diff --git a/app/src/main/java/com/hiddenservices/onionservices/pluginManager/messagePluginManager/messageManager.java b/app/src/main/java/com/hiddenservices/onionservices/pluginManager/messagePluginManager/messageManager.java index c406d805..1382bb45 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/pluginManager/messagePluginManager/messageManager.java +++ b/app/src/main/java/com/hiddenservices/onionservices/pluginManager/messagePluginManager/messageManager.java @@ -25,6 +25,8 @@ import android.widget.ScrollView; import android.widget.TextView; import androidx.appcompat.app.AppCompatActivity; import androidx.constraintlayout.widget.ConstraintLayout; + +import com.hiddenservices.onionservices.appManager.activityContextManager; import com.hiddenservices.onionservices.constants.enums; import com.hiddenservices.onionservices.constants.status; import com.hiddenservices.onionservices.constants.strings; @@ -547,6 +549,10 @@ public class messageManager implements View.OnClickListener, DialogInterface.OnD Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(mStoreURL)); try { mContext.startActivity(intent); + helperMethod.onDelayHandler(mContext, 500, () -> { + mContext.finish(); + return null; + }); } catch (Exception ignored) { helperMethod.showToastMessage(MESSAGE_PLAYSTORE_NOT_FOUND, mContext); } diff --git a/app/src/main/java/com/widget/onionservices/widgetManager/widgetController.java b/app/src/main/java/com/widget/onionservices/widgetManager/widgetController.java index 24ede181..6c78ef8f 100644 --- a/app/src/main/java/com/widget/onionservices/widgetManager/widgetController.java +++ b/app/src/main/java/com/widget/onionservices/widgetManager/widgetController.java @@ -7,6 +7,7 @@ import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; +import android.util.Log; import android.widget.RemoteViews; import com.example.myapplication.R; diff --git a/app/src/main/java/com/widget/onionservices/widgetManager/widgetModelController.java b/app/src/main/java/com/widget/onionservices/widgetManager/widgetModelController.java index 7e7e40fd..1ba78f11 100644 --- a/app/src/main/java/com/widget/onionservices/widgetManager/widgetModelController.java +++ b/app/src/main/java/com/widget/onionservices/widgetManager/widgetModelController.java @@ -29,16 +29,14 @@ public class widgetModelController { private void initialize(Context context, Intent intent){ String action = intent.getAction(); - Log.i("22adsasdasddas","22asdasdsadasdadsasd"); + Log.i("FUCK5","adsdsadasdasdas"); switch (action) { case enums.WidgetCommands.OPEN_APPLICATION: { - Log.i("33adsasdasddas","33asdasdsadasdadsasd"); status.sWidgetResponse = enums.WidgetResponse.SEARCHBAR; helperMethod.onStartApplication(context, CONST_PACKAGE_NAME); break; } case enums.WidgetCommands.OPEN_VOICE: { - Log.i("44adsasdasddas","44asdasdsadasdadsasd"); status.sWidgetResponse = enums.WidgetResponse.VOICE; helperMethod.onStartApplication(context, CONST_PACKAGE_NAME); break; @@ -87,8 +85,8 @@ public class widgetModelController { } public Object onTrigger(widgetEnums.eModelViewController pCommands, List pData){ + Log.i("FUCK6","adsdsadasdasdas"); if(pCommands.equals(widgetEnums.eModelViewController.M_ON_RECIEVE)){ - Log.i("11adsasdasddas","11asdasdsadasdadsasd"); initialize((Context)pData.get(0), (Intent) pData.get(1)); } return null; diff --git a/app/src/main/java/com/widget/onionservices/widgetManager/widgetViewController.java b/app/src/main/java/com/widget/onionservices/widgetManager/widgetViewController.java index db216990..a27d87b0 100644 --- a/app/src/main/java/com/widget/onionservices/widgetManager/widgetViewController.java +++ b/app/src/main/java/com/widget/onionservices/widgetManager/widgetViewController.java @@ -28,8 +28,8 @@ public class widgetViewController extends AppWidgetProvider { private void initialize(int pSize){ if(pSize<=3){ - mViews.setViewVisibility(R.id.pVoiceInput, View.GONE); - mViews.setViewVisibility(R.id.pSearchInputWidget, View.GONE); + mViews.setViewVisibility(R.id.pVoiceInput, View.VISIBLE); + mViews.setViewVisibility(R.id.pSearchInputWidget, View.VISIBLE); }else { mViews.setViewVisibility(R.id.pVoiceInput, View.VISIBLE); mViews.setViewVisibility(R.id.pSearchInputWidget, View.VISIBLE); diff --git a/app/src/main/res/custom-xml/generic/xml-v25/shortcuts.xml b/app/src/main/res/custom-xml/generic/xml-v25/shortcuts.xml index 40076550..9de4d6f0 100644 --- a/app/src/main/res/custom-xml/generic/xml-v25/shortcuts.xml +++ b/app/src/main/res/custom-xml/generic/xml-v25/shortcuts.xml @@ -9,8 +9,8 @@ android:shortcutLongLabel="@string/shortcut_open_long"> + android:targetPackage="com.hiddenservices.onionservices" + android:targetClass="com.hiddenservices.onionservices.appManager.externalCommandManager.externalShortcutController"> @@ -22,8 +22,8 @@ android:shortcutLongLabel="@string/shortcut_erase_and_open_long_label"> + android:targetPackage="com.hiddenservices.onionservices" + android:targetClass="com.hiddenservices.onionservices.appManager.externalCommandManager.externalShortcutController"> @@ -35,8 +35,8 @@ android:shortcutLongLabel="@string/shortcut_erase_long_label"> + android:targetPackage="com.hiddenservices.onionservices" + android:targetClass="com.hiddenservices.onionservices.appManager.externalCommandManager.externalShortcutController"> diff --git a/app/src/main/res/drawable-hdpi/mike.png b/app/src/main/res/drawable-hdpi/mike.png new file mode 100644 index 00000000..72ad9bdc Binary files /dev/null and b/app/src/main/res/drawable-hdpi/mike.png differ diff --git a/app/src/main/res/layouts/searchWidget/layout/widget_search_controller.xml b/app/src/main/res/layouts/searchWidget/layout/widget_search_controller.xml index 0a9cad97..baf2f2cd 100644 --- a/app/src/main/res/layouts/searchWidget/layout/widget_search_controller.xml +++ b/app/src/main/res/layouts/searchWidget/layout/widget_search_controller.xml @@ -75,9 +75,8 @@ android:paddingEnd="10dp" android:scaleX="1.1" android:scaleY="1.1" - android:src="@xml/ic_baseline_keyboard_voice" - android:visibility="visible" - app:tint="@color/c_navigation_tint" /> + android:src="@drawable/mike" + android:visibility="visible"/>