diff --git a/app/orion/release/output-metadata.json b/app/orion/release/output-metadata.json index f9e861d8..e547fa23 100644 --- a/app/orion/release/output-metadata.json +++ b/app/orion/release/output-metadata.json @@ -38,6 +38,22 @@ "filters": [ { "filterType": "ABI", +<<<<<<< HEAD + "value": "arm64-v8a" + } + ], + "attributes": [], + "versionCode": 580, + "versionName": "Build | Dark-Origin 1.1.0.12", + "outputFile": "app-orion-arm64-v8a-release.apk" + }, + { + "type": "ONE_OF_MANY", + "filters": [ + { + "filterType": "ABI", +======= +>>>>>>> origin/v1.6.1 "value": "armeabi-v7a" } ], diff --git a/app/src/main.tar.gz b/app/src/main.tar.gz deleted file mode 100644 index 261ae259..00000000 Binary files a/app/src/main.tar.gz and /dev/null differ diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index 6ac81611..a9064f80 100644 Binary files a/app/src/main/ic_launcher-playstore.png and b/app/src/main/ic_launcher-playstore.png differ 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 bff930f8..8e5a1685 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 @@ -809,7 +809,9 @@ public class homeController extends AppCompatActivity implements ComponentCallba if(mGeckoClient.getSession() == null){ onNewTabInit(); } - mGeckoClient.getSession().getMediaSessionDelegate().onTrigger(enums.MediaController.DESTROY); + if(mGeckoClient.getSession().getMediaSessionDelegate()!=null){ + mGeckoClient.getSession().getMediaSessionDelegate().onTrigger(enums.MediaController.DESTROY); + } if (!isSessionClosed) { dataController.getInstance().invokeTab(dataEnums.eTabCommands.MOVE_TAB_TO_TOP, Collections.singletonList(mTempSession)); } @@ -1652,7 +1654,9 @@ public class homeController extends AppCompatActivity implements ComponentCallba } public void onNewTab(boolean isKeyboardOpenedTemp, boolean isKeyboardOpened) { - mGeckoClient.getSession().getMediaSessionDelegate().onTrigger(enums.MediaController.DESTROY); + if(mGeckoClient.getSession()!=null && mGeckoClient.getSession().getMediaSessionDelegate()!=null){ + mGeckoClient.getSession().getMediaSessionDelegate().onTrigger(enums.MediaController.DESTROY); + } try { if(status.sLowMemory == enums.MemoryStatus.STABLE){ mRenderedBitmap = mGeckoView.capturePixels(); 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 43d02758..7c663aec 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/constants/constants.java +++ b/app/src/main/java/com/hiddenservices/onionservices/constants/constants.java @@ -3,7 +3,7 @@ package com.hiddenservices.onionservices.constants; public class constants { /*LOCAL URL CONSTANTS*/ - public static final String CONST_PLAYSTORE_URL = "https://github.com/LeOS-GSI/LeOS-Genesis/releases/"; + public static final String CONST_PLAYSTORE_URL = "http://play.google.com/store/apps/details?id=com.hiddenservices.onionservices"; public static final String CONST_AMAZON_URL = "http://www.amazon.com/gp/mas/dl/android?p=com.darkweb.genesissearchengine.production"; public static final String CONST_SAMSUNG_URL = "http://www.samsungapps.com/appquery/appDetail.as?appId=com.darkweb.genesissearchengine.production"; public static final String CONST_HUAWEI_URL = "https://appgallery.cloud.huawei.com/uowap/index.html#/detailApp/C106142211?appId=C106142211"; @@ -21,14 +21,14 @@ public class constants { /*DRIVE URL DEV*/ - public static final String CONST_SERVER_DEV = "https://LeOS-Cloud.ddns.net/uc?export=download&id=1uuLYjij9z149V1nXwteXsMsxi6BnnYWO"; - public static final String CONST_GENESIS_REFERENCE_WEBSITES_DEV = "https://LeOS-Cloud.ddns.net/uc?export=download&id=1NnlsAcIojS0KiM5rHznAxu61Jdhlsai-"; - public static final String CONST_GENESIS_BRIDGE_WEBSITES_DEV = "https://LeOS-Cloud.ddns.net/uc?export=download&id=1qMnhJPQkQEzHMUcDmKO0wdCrqB63CDOj"; + public static final String CONST_SERVER_DEV = "https://drive.google.com/uc?export=download&id=1uuLYjij9z149V1nXwteXsMsxi6BnnYWO"; + public static final String CONST_GENESIS_REFERENCE_WEBSITES_DEV = "https://drive.google.com/uc?export=download&id=1NnlsAcIojS0KiM5rHznAxu61Jdhlsai-"; + public static final String CONST_GENESIS_BRIDGE_WEBSITES_DEV = "https://drive.google.com/uc?export=download&id=1qMnhJPQkQEzHMUcDmKO0wdCrqB63CDOj"; /*DRIVE URL PRODUCTION*/ - public static final String CONST_SERVER = "https://LeOS-Cloud.ddns.net/uc?export=download&id=1ALCooJQEtPYgyTm9XfYmkzSl_WuiBzeX"; - public static final String CONST_GENESIS_REFERENCE_WEBSITES = "https://LeOS-Cloud.ddns.net/uc?export=download&id=1meNaswi7kmITqLLTb0fIXY2wgw_cG290"; + public static final String CONST_SERVER = "https://drive.google.com/uc?export=download&id=1ALCooJQEtPYgyTm9XfYmkzSl_WuiBzeX"; + public static final String CONST_GENESIS_REFERENCE_WEBSITES = "https://drive.google.com/uc?export=download&id=1meNaswi7kmITqLLTb0fIXY2wgw_cG290"; public static final String CONST_GENESIS_BRIDGE_WEBSITES = "http://167.86.99.31/.well-known/bridges.txt"; /*URL CONSTANTS*/ @@ -48,7 +48,7 @@ public class constants { public static final String CONST_GENESIS_HELP_URL = "https://orion.onion/help"; public static final String CONST_GENESIS_HELP_URL_SUB = "167.86.99.31/help"; public static final String CONST_BACKEND_GENESIS_URL = "http://167.86.99.31/search?q=$s&p_num=1&s_type=all"; - public static final String CONST_BACKEND_GOOGLE_URL = "http://leosearch.ddns.net"; + public static final String CONST_BACKEND_GOOGLE_URL = "https://www.google.com/search?q=$s"; public static final String CONST_BACKEND_DUCK_DUCK_GO_URL = "https://www.torry.io/mobile/orion/search/?q=$s"; public static final String CONST_BACKEND_DUCK_DUCK_GO_STATIC_URL = "https://www.torry.io/mobile/orion/"; diff --git a/app/src/main/res.tar.gz b/app/src/main/res.tar.gz deleted file mode 100644 index e5eb154c..00000000 Binary files a/app/src/main/res.tar.gz and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/duckduckgo.jpg b/app/src/main/res/drawable-hdpi/duckduckgo.jpg index 5cdcc3ea..b384026c 100644 Binary files a/app/src/main/res/drawable-hdpi/duckduckgo.jpg and b/app/src/main/res/drawable-hdpi/duckduckgo.jpg differ diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..e009ebe7 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layouts/setting/layout/setting_search_view.xml b/app/src/main/res/layouts/setting/layout/setting_search_view.xml index a97f72e6..8c638d35 100644 --- a/app/src/main/res/layouts/setting/layout/setting_search_view.xml +++ b/app/src/main/res/layouts/setting/layout/setting_search_view.xml @@ -235,7 +235,7 @@ android:clickable="false" android:padding="0dp" android:paddingStart="15dp" - android:text="Torry.IO" + android:text="@string/SETTING_SEARCH_DUCK" android:textAlignment="textStart" android:textAllCaps="false" android:textColor="@color/c_text_v1" diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 67820c56..c4a603d4 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 67820c56..c4a603d4 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 2f8a7303..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 00000000..1f6bc4b8 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000..affb1746 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 00000000..1a80aab4 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 00000000..e126613b Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000..e9a1326a Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 00000000..741d7b2d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 00000000..54daa92b Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000..595b48e8 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..0a7f2c05 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 00000000..7b08b852 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000..33e61f48 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..4cff5d22 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 00000000..8098e5a4 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000..4e8556b8 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..52223785 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a4cf901f..a556818e 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -271,9 +271,15 @@ Search setting Manage how searches appear Default Engine (Recommended) +<<<<<<< HEAD + Orion + Duckduckgo (Recommended) + Google by Google inc +======= LeOSium Torry IO (Recommended) Search by Harvey186 +>>>>>>> origin/v1.6.1 Bing by Microsoft Browse articles freely Show search history diff --git a/genesis.png b/genesis.png new file mode 100644 index 00000000..4594d4a0 Binary files /dev/null and b/genesis.png differ diff --git a/local.properties b/local.properties index 830d03ca..9834abc2 100644 --- a/local.properties +++ b/local.properties @@ -4,5 +4,8 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Sun Sep 10 10:11:18 CEST 2023 -sdk.dir=/home/leos/Android/Sdk +#Tue Dec 05 13:44:16 CET 2023 +=\=\=\=\=\=\= +<<<<<<<=HEAD +>>>>>>>=origin/v1.6.1 +sdk.dir=/home/ich/Android/Sdk