restart / icons

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"
         }
       ],

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();
         }
+        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) {
+        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();

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/";

app/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="0"
+      android:scaleY="0"
+      android:translateX="54"
+      android:translateY="54">
+      <path android:fillColor="#3DDC84"
+            android:pathData="M0,0h108v108h-108z"/>
+      <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+      <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+  </group>
+</vector>

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"

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
+    <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
+    <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/values/strings.xml

@@ -271,9 +271,15 @@
     <string name="SETTING_SEARCH_HEADER_2" translatable="true">Search setting</string>
     <string name="SETTING_SEARCH_HEADER_2_INFO" translatable="true">Manage how searches appear</string>
     <string name="SETTING_SEARCH_DEFAULT" translatable="false">Default Engine (Recommended)</string>
+<<<<<<< HEAD
+    <string name="SETTING_SEARCH_GENESIS" translatable="false">Orion</string>
+    <string name="SETTING_SEARCH_DUCK" translatable="false">Duckduckgo (Recommended)</string>
+    <string name="SETTING_SEARCH_GOOGLE" translatable="false">Google by Google inc</string>
+=======
     <string name="SETTING_SEARCH_GENESIS" translatable="false">LeOSium</string>
     <string name="SETTING_SEARCH_DUCK" translatable="false">Torry IO (Recommended)</string>
     <string name="SETTING_SEARCH_GOOGLE" translatable="false">Search by Harvey186</string>
+>>>>>>> origin/v1.6.1
     <string name="SETTING_SEARCH_AMAZON" translatable="false">Bing by Microsoft</string>
     <string name="SETTING_SEARCH_BING" translatable="false">Browse articles freely</string>
     <string name="SETTING_SEARCH_HISTORY" translatable="true">Show search history</string>

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