bug fixes

bug fixes

.idea/deploymentTargetDropDown.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\msman\.android\avd\Pixel_6_Pro_API_33.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-02-25T10:45:48.329718700Z" />
-  </component>
-</project>

.safedk/hashes.safedk

@@ -1,3 +1,3 @@
-#Sat Feb 25 16:05:10 PKT 2023
+#Sun Feb 26 18:36:51 PKT 2023
 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000=
-json=2083951825
+json=-1222968406

.safedk/plugin.properties

@@ -1,5 +1,5 @@
 #
-#Sat Feb 25 16:05:10 PKT 2023
+#Sun Feb 26 18:36:51 PKT 2023
 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000=
 pCPe4EeU2ZQVwQPeHLgseRqHBX1V5pvo9Piuu4J809dRhadEgukXa1A8po_UeXu5hmPOTaP1v4QPaMKIEOhh50=hGlhanpemGqPOKKAgaXvhyxwZaG9uD68csy1OadWTNhEgKvBWR7-7KSpyFr6nfZ4KMOuBBV5J49s2LLSg-SVxg
 sdk_analysis_plugin_version=4.8.5

app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/delegateModel/contentDelegate.java

@@ -3,6 +3,8 @@ package com.hiddenservices.onionservices.appManager.homeManager.geckoManager.del
 
 import static com.hiddenservices.onionservices.pluginManager.pluginEnums.eMessageManager.M_LONG_PRESS_URL;
 import static com.hiddenservices.onionservices.pluginManager.pluginEnums.eMessageManager.M_LONG_PRESS_WITH_LINK;
+
+import android.Manifest;
 import android.content.ActivityNotFoundException;
 import android.os.Handler;
 import android.util.Log;
@@ -18,11 +20,18 @@ import com.hiddenservices.onionservices.constants.status;
 import com.hiddenservices.onionservices.constants.strings;
 import com.hiddenservices.onionservices.eventObserver;
 import com.hiddenservices.onionservices.helperManager.helperMethod;
+import com.karumi.dexter.Dexter;
+import com.karumi.dexter.MultiplePermissionsReport;
+import com.karumi.dexter.PermissionToken;
+import com.karumi.dexter.listener.PermissionRequest;
+import com.karumi.dexter.listener.multi.MultiplePermissionsListener;
+
 import org.json.JSONObject;
 import org.mozilla.geckoview.GeckoSession;
 import org.mozilla.geckoview.WebResponse;
 import java.lang.ref.WeakReference;
 import java.util.Arrays;
+import java.util.List;
 
 public class contentDelegate implements GeckoSession.ContentDelegate {
 
@@ -94,6 +103,23 @@ public class contentDelegate implements GeckoSession.ContentDelegate {
     @UiThread
     @Override
     public void onExternalResponse(@NonNull GeckoSession session, @NonNull WebResponse response) {
+        Dexter.withContext(mContext.get())
+                .withPermissions(
+                        Manifest.permission.CAMERA,
+                        Manifest.permission.READ_CONTACTS,
+                        Manifest.permission.MEDIA_CONTENT_CONTROL,
+                        Manifest.permission.MANAGE_MEDIA,
+                        Manifest.permission.ACCESS_MEDIA_LOCATION,
+                        Manifest.permission.READ_MEDIA_AUDIO,
+                        Manifest.permission.READ_MEDIA_VIDEO,
+                        Manifest.permission.READ_MEDIA_IMAGES,
+                        Manifest.permission.MANAGE_EXTERNAL_STORAGE,
+                        Manifest.permission.READ_EXTERNAL_STORAGE,
+                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                        Manifest.permission.RECORD_AUDIO
+                ).withListener(new MultiplePermissionsListener() {
+                    @Override
+                    public void onPermissionsChecked(MultiplePermissionsReport multiplePermissionsReport) {
                         try {
                             if (response.headers.containsKey("Content-Disposition")) {
                                 mDownloadManager.downloadFile(response, mGeckoSession, mContext.get(), mEvent);
@@ -106,6 +132,13 @@ public class contentDelegate implements GeckoSession.ContentDelegate {
                         }
                     }
 
+                    @Override
+                    public void onPermissionRationaleShouldBeShown(List<PermissionRequest> list, PermissionToken permissionToken) {
+
+                    }
+                }).check();
+    }
+
     @UiThread
     public void onFirstContentfulPaint(@NonNull GeckoSession var1) {
         if (!mGeckoDataModel.mCurrentURL.equals("about:blank")) {

app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/delegateModel/mediaDelegate.java

@@ -42,8 +42,10 @@ public class mediaDelegate implements GeckoSession.MediaDelegate {
     }
 
     public void onHideDefaultNotification(){
+        if(!status.mThemeApplying){
             NotificationManagerCompat.from(mContext.get()).cancel(S_NOTIFICATION_ID);
         }
+    }
 
     /*Triggers*/
 

app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/delegateModel/navigationDelegate.java

@@ -10,10 +10,12 @@ import static com.hiddenservices.onionservices.constants.constants.CONST_GENESIS
 import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 import androidx.appcompat.app.AppCompatActivity;
 import com.hiddenservices.onionservices.appManager.homeManager.geckoManager.dataModel.geckoDataModel;
 import com.hiddenservices.onionservices.appManager.homeManager.geckoManager.geckoSession;
 import com.hiddenservices.onionservices.appManager.homeManager.geckoManager.helperClasses.errorHandler;
+import com.hiddenservices.onionservices.appManager.homeManager.geckoManager.helperClasses.intentHandler;
 import com.hiddenservices.onionservices.appManager.homeManager.geckoManager.helperClasses.preferencesHandler;
 import com.hiddenservices.onionservices.appManager.homeManager.homeController.homeEnums;
 import com.hiddenservices.onionservices.constants.constants;
@@ -30,6 +32,7 @@ import org.torproject.android.service.wrapper.orbotLocalConstants;
 import java.io.InputStream;
 import java.lang.ref.WeakReference;
 import java.util.Arrays;
+import java.util.List;
 
 public class navigationDelegate implements GeckoSession.NavigationDelegate {
 
@@ -62,6 +65,12 @@ public class navigationDelegate implements GeckoSession.NavigationDelegate {
         mCanGoForward = var2;
     }
 
+    @UiThread
+    public void onLocationChange(@NonNull GeckoSession session, @Nullable String url, final @NonNull List<GeckoSession.PermissionDelegate.ContentPermission> perms) {
+        url = "";
+
+    }
+
     private String setGenesisVerificationToken(String pString) {
         try {
             if (pString.contains("?")) {
@@ -84,6 +93,9 @@ public class navigationDelegate implements GeckoSession.NavigationDelegate {
         }
 
         String m_url = var1.uri;
+        if(m_url.startsWith("tel:")){
+            return GeckoResult.fromValue(AllowOrDeny.DENY);
+        }
         if (helperMethod.getHost(m_url).endsWith(".onion")) {
             m_url = m_url.replace("www.", "");
         }

app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/delegateModel/progressDelegate.java

@@ -12,6 +12,9 @@ import com.hiddenservices.onionservices.constants.constants;
 import com.hiddenservices.onionservices.constants.status;
 import com.hiddenservices.onionservices.eventObserver;
 import com.hiddenservices.onionservices.helperManager.helperMethod;
+
+import org.mozilla.geckoview.AllowOrDeny;
+import org.mozilla.geckoview.GeckoResult;
 import org.mozilla.geckoview.GeckoSession;
 import java.lang.ref.WeakReference;
 import java.util.Arrays;
@@ -74,10 +77,15 @@ public class progressDelegate implements GeckoSession.ProgressDelegate {
 
     @Override
     public void onPageStart(@NonNull GeckoSession var1, @NonNull String var2) {
+        if(var2.startsWith("tel:")){
+            intentHandler.actionDial(var2, mContext);
+            return;
+        }
         securityInfo = null;
         mGeckoDataModel.mTheme = null;
         mProgress = 5;
         mEvent.invokeObserver(Arrays.asList(5, mGeckoDataModel.mSessionID), homeEnums.eGeckoCallback.PROGRESS_UPDATE);
+
         if(var2.startsWith("jar:file")){
             return;
         }
@@ -152,6 +160,9 @@ public class progressDelegate implements GeckoSession.ProgressDelegate {
     }
 
     public boolean getSecurtityState(){
+        if(mGeckoDataModel.mCurrentURL.equals("about:blank") || mGeckoDataModel.mCurrentURL.startsWith("resource://android/assets/policy")){
+            return true;
+        }
         if(securityInfo==null){
             return false;
         }else {

app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeController.java

@@ -263,7 +263,9 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         status.sSettingIsAppRunning = true;
         initPreFixes();
         initBundle();
+        if(!status.mThemeApplying){
             initTor();
+        }
         onMemoryCalculate();
         pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_INIT_ADS);
         mHomeViewController.updateBannerAdvertStatus(true, (boolean) pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED));
@@ -301,14 +303,14 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             }
             new Handler().postDelayed(() ->
             {
-                onShowDefaultNotification();
+                onShowDefaultNotification(true);
             }, 500);
         }else {
             onHideDefaultNotification();
             int notificationStatus = status.sNotificaionStatus;
             if (notificationStatus == 0) {
                 pluginController.getInstance().onOrbotInvoke(null, pluginEnums.eOrbotManager.M_DISABLE_NOTIFICATION);
-                activityContextManager.getInstance().getHomeController().onShowDefaultNotification();
+                activityContextManager.getInstance().getHomeController().onShowDefaultNotification(true);
             } else {
                 if(status.mThemeApplying){
                     new Handler().postDelayed(() ->
@@ -512,7 +514,11 @@ public class homeController extends AppCompatActivity implements ComponentCallba
                     mHomeViewController.onUpdateSearchEngineBar(false, 150);
                     mSearchbar.clearFocus();
                     mHomeViewController.onClearSelections(true);
+                    if(mProgressBar.getProgress()<=0 || mProgressBar.getProgress()>=100){
                         mHomeViewController.onUpdateSearchBar(mGeckoClient.getSession().getCurrentURL(), false, false, true);
+                    }else {
+                        mHomeViewController.triggerUpdateSearchBar(mPastURL, false, false, true);
+                    }
                 }
                 return false;
             });
@@ -620,7 +626,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
     public void initPreFixes() {
         try {
             if(status.mThemeApplying){
-                onShowDefaultNotification();
+                onShowDefaultNotification(true);
             }else {
                 onHideDefaultNotification();
             }
@@ -918,12 +924,14 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         mGeckoClient.onMediaInvoke(enums.MediaController.SKIP_BACKWARD);
     }
 
-    public void onShowDefaultNotification(){
+    public void onShowDefaultNotification(boolean pSticky){
-        showDefaultNotification(this, "Orion Browser");
+        showDefaultNotification(this, "Orion Browser", pSticky);
     }
     public void onHideDefaultNotification(){
+        if(!status.mThemeApplying){
             NotificationManagerCompat.from(this).cancelAll();
-        NotificationManagerCompat.from(this).cancel(1025);
+            NotificationManagerCompat.from(this).cancel(1125);
+        }
     }
 
     public void resetAndRestart(){
@@ -953,20 +961,25 @@ public class homeController extends AppCompatActivity implements ComponentCallba
     }
 
     NotificationManager manager = null;
-    public void showDefaultNotification(Context context, String title) {
+    public void showDefaultNotification(Context context, String title, boolean isSticky) {
         if(!status.mThemeApplying && status.sTorBrowsing && status.sNotificaionStatus != 0 || !orbotLocalConstants.mAppStarted || status.sNotificaionStatus == 0){
             return;
         }
+        if(status.mThemeApplying){
+            return;
+        }
 
         manager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        if(!status.mThemeApplying){
             pluginController.getInstance().onOrbotInvoke(null, pluginEnums.eOrbotManager.M_DISABLE_NOTIFICATION);
+        }
 
         PendingIntent action;
 
         if (SDK_INT >= Build.VERSION_CODES.M) {
-            action = PendingIntent.getActivity(context, 1025, new Intent(context, homeController.class), PendingIntent.FLAG_IMMUTABLE); // Flag indicating that if the described PendingIntent already exists, the current one should be canceled before generating a new one.
+            action = PendingIntent.getActivity(context, 1125, new Intent(context, homeController.class), PendingIntent.FLAG_IMMUTABLE); // Flag indicating that if the described PendingIntent already exists, the current one should be canceled before generating a new one.
         }else {
-            action = PendingIntent.getActivity(context, 1025, new Intent(context, homeController.class), 0); // Flag indicating that if the described PendingIntent already exists, the current one should be canceled before generating a new one.
+            action = PendingIntent.getActivity(context, 1125, new Intent(context, homeController.class), 0); // Flag indicating that if the described PendingIntent already exists, the current one should be canceled before generating a new one.
         }
 
         NotificationCompat.Builder builder = new NotificationCompat.Builder(this, "notify_001");
@@ -989,31 +1002,33 @@ public class homeController extends AppCompatActivity implements ComponentCallba
 
         Intent intentActionOpen = new Intent(context,homeController.class);
         intentActionOpen.putExtra("action","Open");
-        PendingIntent pIntentOpen = helperMethod.onCreateActionIntent(context, defaultNotificationReciever.class, 1025, "media_play", 0);
+        PendingIntent pIntentOpen = helperMethod.onCreateActionIntent(context, defaultNotificationReciever.class, 1125, "media_play", 0);
         builder.addAction(0, "ERASE AND RESET", pIntentOpen);
 
         Intent intentActionClose = new Intent(context,homeController.class);
         intentActionClose.putExtra("action","Exit");
-        PendingIntent pIntentClose = helperMethod.onCreateActionIntent(context, defaultNotificationReciever.class, 1025, "media_pause", 1);
+        PendingIntent pIntentClose = helperMethod.onCreateActionIntent(context, defaultNotificationReciever.class, 1125, "media_pause", 1);
         builder.addAction(0, "EXIT BROWSER", pIntentClose);
 
         Notification notification = builder.build();
         PendingIntent dummyIntent = null;
 
         if (SDK_INT >= Build.VERSION_CODES.M) {
-            PendingIntent.getActivity(context, 1025, new Intent(), PendingIntent.FLAG_IMMUTABLE);
+            PendingIntent.getActivity(context, 1125, new Intent(), PendingIntent.FLAG_IMMUTABLE);
         }else {
-            PendingIntent.getActivity(context, 1025, new Intent(), 0);
+            PendingIntent.getActivity(context, 1125, new Intent(), 0);
         }
         notification.fullScreenIntent = dummyIntent;
 
+        if(isSticky){
             if (SDK_INT >= Build.VERSION_CODES.TIRAMISU){
                 notification.flags = Notification.FLAG_AUTO_CANCEL|Notification.FLAG_ONGOING_EVENT;
             }else {
                 notification.flags |= Notification.FLAG_NO_CLEAR;
             }
+        }
 
-        int notificationCode = 1025;
+        int notificationCode = 1125;
 
         manager.notify(notificationCode, notification);
     }
@@ -1121,10 +1136,10 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         orbotLocalConstants.mAppForceExit = true;
         if (!status.mThemeApplying) {
             NotificationManagerCompat.from(this).cancel(1030);
-            NotificationManagerCompat.from(this).cancel(1025);
+            NotificationManagerCompat.from(this).cancel(1125);
         }
-        if(manager!=null){
+        if(manager!=null && !status.mThemeApplying){
-            manager.cancel(1025);
+            manager.cancel(1125);
         }
         if(mGeckoClient.getSession() !=null){
             mGeckoClient.getSession().getMediaSessionDelegate().onTrigger(enums.MediaController.DESTROY);
@@ -1418,12 +1433,18 @@ public class homeController extends AppCompatActivity implements ComponentCallba
                             mHomeViewController.onUpdateSearchEngineBar(false, 150);
                         }
                         mHomeViewController.initSearchBarFocus(false, isKeyboardOpened);
-                        mHomeViewController.onUpdateSearchBar(mGeckoClient.getSession().getCurrentURL(), false, true, false);
+                        if(mProgressBar.getProgress()<=0 || mProgressBar.getProgress()>=100){
+                            mHomeViewController.onUpdateSearchBar(mGeckoClient.getSession().getCurrentURL(), false, false, false);
+                        }else {
+                            mHomeViewController.triggerUpdateSearchBar(mPastURL, false, false, false);
+                        }
                         helperMethod.hideKeyboard(homeController.this);
                     }
                 }
                 mSearchbar.setSelection(0);
             } else {
+                mPastURL = mSearchbar.getText().toString();
+
                 msearchstatuscopy = true;
                 mSearchBarWasBackButtonPressed = false;
                 if (!isFocusChanging) {
@@ -1451,6 +1472,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             mSearchBarLoading = false;
         }, 150);
     };
+    String mPastURL = "";
 
     public void onSearchBarInvoked(View view) {
         String url;
@@ -1947,13 +1969,14 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         if (mGeckoClient.getSession() != null && mGeckoClient != null) {
             mGeckoClient.onMediaInvoke(enums.MediaController.PAUSE);
         }
-
+        onShowDefaultNotification(false);
+        orbotLocalConstants.mSoftNotification = true;
     }
 
     @Override
     public void onResume() {
         if(status.sNotificaionStatus == 1){
-            onShowDefaultNotification();
+            onShowDefaultNotification(true);
         }
         orbotLocalConstants.mAppForceExit = false;
 
@@ -2030,6 +2053,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
 
         status.mThemeApplying = false;
 
+        orbotLocalConstants.mSoftNotification = false;
         super.onResume();
     }
 
@@ -2260,7 +2284,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             mHomeViewController.initHomePage();
         }
         onInvokeProxyLoading();
-        onShowDefaultNotification();
+        onShowDefaultNotification(true);
     }
 
     public void onStartApplication(View view) {
@@ -2269,7 +2293,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         int notificationStatus = status.sNotificaionStatus;
         if (notificationStatus == 0) {
             pluginController.getInstance().onOrbotInvoke(null, pluginEnums.eOrbotManager.M_DISABLE_NOTIFICATION);
-            activityContextManager.getInstance().getHomeController().onShowDefaultNotification();
+            activityContextManager.getInstance().getHomeController().onShowDefaultNotification(true);
         } else {
             new Handler().postDelayed(() ->
             {
@@ -3109,6 +3133,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             } else if (e_type.equals(homeEnums.eGeckoCallback.PROGRESS_UPDATE_FORCED)) {
                 //mHomeViewController.onProgressBarUpdate((int) data.get(0), true, isStaticURL());
             } else if (e_type.equals(homeEnums.eGeckoCallback.ON_UPDATE_SEARCH_BAR)) {
+                mPastURL = (String) data.get(0);
                 mHomeViewController.onUpdateSearchBar((String) data.get(0), false, false, false);
             } else if (e_type.equals(homeEnums.eGeckoCallback.ON_FIRST_PAINT)) {
                 mHomeViewController.onFirstPaint();
@@ -3165,9 +3190,11 @@ public class homeController extends AppCompatActivity implements ComponentCallba
                 pluginController.getInstance().onLanguageInvoke(Arrays.asList(homeController.this, status.sSettingLanguage, status.sSettingLanguageRegion, status.mThemeApplying), pluginEnums.eLangManager.M_SET_LANGUAGE);
                 initLocalLanguage();
                 mHomeViewController.onPageFinished();
-                mHomeViewController.onUpdateSearchBar(dataToStr(data.get(0), mGeckoClient.getSession().getCurrentURL()), false, true, false);
+                mPastURL = (String) data.get(0);
+                mHomeViewController.onUpdateSearchBar(dataToStr(data.get(0), mGeckoClient.getSession().getCurrentURL()), false, false, false);
             } else if (e_type.equals(homeEnums.eGeckoCallback.SEARCH_UPDATE)) {
-                mHomeViewController.onUpdateSearchBar(dataToStr(data.get(0), mGeckoClient.getSession().getCurrentURL()), false, true, false);
+                mPastURL = (String) data.get(0);
+                mHomeViewController.onUpdateSearchBar(dataToStr(data.get(0), mGeckoClient.getSession().getCurrentURL()), false, false, false);
             } else if (e_type.equals(homeEnums.eGeckoCallback.DOWNLOAD_FILE_POPUP)) {
                 List<Object> mData = new ArrayList<>();
                 mData.addAll(data);
@@ -3236,7 +3263,8 @@ public class homeController extends AppCompatActivity implements ComponentCallba
                 pluginController.getInstance().onMessageManagerInvoke(Collections.singletonList(homeController.this), M_ORBOT_LOADING);
                 new Handler().postDelayed(() ->
                 {
-                    mHomeViewController.onUpdateSearchBar(mGeckoClient.getSession().getCurrentURL(), false, false, true);
+                    mPastURL = mGeckoClient.getSession().getCurrentURL();
+                    mHomeViewController.onUpdateSearchBar(mGeckoClient.getSession().getCurrentURL(), false, false, false);
                 }, 1000);
             }
             else if (e_type.equals(homeEnums.eGeckoCallback.M_DEFAULT_BROWSER)) {

app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeViewController.java

@@ -402,12 +402,16 @@ public class homeViewController {
     }
 
     public void setSecurityColor(){
+        boolean ssl = (boolean)mEvent.invokeObserver(null, homeEnums.eHomeViewCallback.M_GET_SSL_STATUS);
+        if (mSearchbar.hasFocus()) {
+            ssl_status = true;
+            return;
+        }
         mSearchLock.setColorFilter(null);
         mSearchLock.clearColorFilter();
         mSearchLock.setImageTintList(null);
 
         mSearchLock.setImageDrawable(helperMethod.getDrawableXML(mContext, R.xml.ic_baseline_lock));
-        boolean ssl = (boolean)mEvent.invokeObserver(null, homeEnums.eHomeViewCallback.M_GET_SSL_STATUS);
         if(ssl || status.sTorBrowsing){
             if(helperMethod.getColorDensity(((ColorDrawable)mTopBar.getBackground()).getColor()) < 0.80){
                 mSearchLock.setColorFilter(ContextCompat.getColor(mContext, R.color.c_white));
@@ -420,7 +424,6 @@ public class homeViewController {
             ssl_status = false;
         }
     }
-
     @SuppressLint("UseCompatLoadingForDrawables")
     public void initSearchBarFocus(boolean pStatus, boolean mIsKeyboardOpened) {
         if (!pStatus) {
@@ -1146,6 +1149,22 @@ public class homeViewController {
     private Handler mSearchUpdateHandler = null;
 
     void onUpdateSearchBar(String url, boolean showProtocol, boolean pClearText, boolean pBypassFocus) {
+
+        if (mSearchbar.isFocused()){
+            if(mProgressBar.getProgress()>0 && mProgressBar.getProgress()<100){
+                if(!mSearchbar.getText().toString().startsWith("http")){
+                    if(url.startsWith("https://")){
+                        url = "https://" + mSearchbar.getText().toString();
+                    }
+                    else{
+                        url = "http://" + mSearchbar.getText().toString();
+                    }
+                }else {
+                    url = mSearchbar.getText().toString();
+                }
+            }
+        }
+
         String mURL = url;
         if (mURL.endsWith("genesisconfigurenewidentity.com/")) {
             return;

app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/notificationManager/settingNotificationController.java

@@ -97,7 +97,7 @@ public class settingNotificationController extends AppCompatActivity {
             activityContextManager.getInstance().getHomeController().onHideDefaultNotification();
         } else {
             pluginController.getInstance().onOrbotInvoke(null, pluginEnums.eOrbotManager.M_ENABLE_NOTIFICATION);
-            activityContextManager.getInstance().getHomeController().onShowDefaultNotification();
+            activityContextManager.getInstance().getHomeController().onShowDefaultNotification(true);
         }
     }
 

app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/notificationManager/settingNotificationModel.java

@@ -33,7 +33,7 @@ class settingNotificationModel {
             if(status.sTorBrowsing){
                 pluginController.getInstance().onOrbotInvoke(null, pluginEnums.eOrbotManager.M_ENABLE_NOTIFICATION);
             }else {
-                activityContextManager.getInstance().getHomeController().onShowDefaultNotification();
+                activityContextManager.getInstance().getHomeController().onShowDefaultNotification(true);
             }
         }
     }

app/src/main/java/com/hiddenservices/onionservices/helperManager/helperMethod.java

@@ -13,7 +13,6 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Color;
@@ -84,6 +83,8 @@ import java.util.concurrent.Callable;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.net.ssl.HttpsURLConnection;
+import org.mozilla.geckoview.ContentBlocking;
+import org.torproject.android.service.wrapper.orbotLocalConstants;
 import static android.content.Context.LAYOUT_INFLATER_SERVICE;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION;
@@ -93,9 +94,6 @@ import static com.hiddenservices.onionservices.constants.keys.M_ACTIVITY_NAVIGAT
 import static com.hiddenservices.onionservices.constants.keys.M_RESTART_APP_KEY;
 import static com.hiddenservices.onionservices.pluginManager.pluginEnums.eMessageManager.M_OPEN_ACTIVITY_FAILED;
 
-import org.mozilla.geckoview.ContentBlocking;
-import org.torproject.android.service.wrapper.orbotLocalConstants;
-
 public class helperMethod {
     /*Helper Methods General*/
 
@@ -396,7 +394,7 @@ public class helperMethod {
 
         final Intent emailIntent = new Intent(Intent.ACTION_SEND);
         emailIntent.putExtra(Intent.EXTRA_EMAIL, new String[]{"orionhiddentechnologies@gmail.com"});
-        emailIntent.putExtra(Intent.EXTRA_SUBJECT, "Issue Report");
+        emailIntent.putExtra(Intent.EXTRA_SUBJECT, "Issue Title");
         emailIntent.putExtra(Intent.EXTRA_TEXT, "Write Message Here....");
         emailIntent.setSelector(selectorIntent);
         context.startActivity(Intent.createChooser(emailIntent, "Send email..."));

app/src/main/java/com/hiddenservices/onionservices/pluginManager/messagePluginManager/messageManager.java

@@ -463,6 +463,16 @@ public class messageManager implements View.OnClickListener, DialogInterface.OnD
             mDescription = data_local;
         }
 
+        if(mDescription.equals("")){
+            mDescription = url;
+        }
+        if(mDescriptionShort.equals("")){
+            mDescription = "";
+            mDescriptionShort = mDescription;
+        }
+        if(mDescriptionShort.length()>50){
+            mDescriptionShort = mDescriptionShort.substring(0, 50)+"...";
+        }
 
         initializeDialog(R.layout.popup_download_full, Gravity.CENTER);
 
@@ -477,8 +487,12 @@ public class messageManager implements View.OnClickListener, DialogInterface.OnD
         LinearLayout mPopupDownloadFullImageCopy = mDialog.findViewById(R.id.pPopupDownloadFullImageCopy);
         LinearLayout mPopupDownloadFullImageDownload = mDialog.findViewById(R.id.pPopupDownloadFullImageDownload);
 
-        mPopupDownloadFullDescription.setText((mDescription));
+        if(mDescription.startsWith("http")){
+            mPopupDownloadFullDescriptionShort.setText("static url");
+        }else {
             mPopupDownloadFullDescriptionShort.setText((mDescriptionShort));
+        }
+        mPopupDownloadFullDescription.setText((mDescription));
         mEvent.invokeObserver(Arrays.asList((mPopupDownloadFullImage), helperMethod.getDomainName(data_local)), ON_FETCH_FAVICON);
 
         if (mData != null) {
@@ -852,7 +866,7 @@ public class messageManager implements View.OnClickListener, DialogInterface.OnD
 
                 case M_POPUP_BLOCKED:
                     /*VERIFIED*/
-                    onShowToast(R.layout.popup_toast_generic, R.xml.ax_background_generic, 2000, mContext.getString(R.string.TOAST_ALERT_SETTING_PRIVACY_POPUP), mContext.getString(R.string.TOAST_ALERT_SETTING), M_OPEN_PRIVACY);
+                    onShowToast(R.layout.popup_toast_generic, R.xml.ax_background_important, 2000, mContext.getString(R.string.TOAST_ALERT_SETTING_PRIVACY_POPUP), mContext.getString(R.string.TOAST_ALERT_SETTING), M_OPEN_PRIVACY);
                     break;
 
                 case M_MAX_TAB_REACHED:

app/src/main/java/com/hiddenservices/onionservices/pluginManager/pluginController.java

@@ -1,5 +1,6 @@
 package com.hiddenservices.onionservices.pluginManager;
 
+import android.Manifest;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
@@ -24,6 +25,12 @@ import com.hiddenservices.onionservices.pluginManager.downloadPluginManager.down
 import com.hiddenservices.onionservices.pluginManager.langPluginManager.langManager;
 import com.hiddenservices.onionservices.pluginManager.messagePluginManager.messageManager;
 import com.hiddenservices.onionservices.pluginManager.orbotPluginManager.orbotManager;
+import com.karumi.dexter.Dexter;
+import com.karumi.dexter.MultiplePermissionsReport;
+import com.karumi.dexter.PermissionToken;
+import com.karumi.dexter.listener.PermissionRequest;
+import com.karumi.dexter.listener.multi.MultiplePermissionsListener;
+
 import java.lang.ref.WeakReference;
 import java.util.Arrays;
 import java.util.Collections;
@@ -225,7 +232,25 @@ public class pluginController {
                     activityContextManager.getInstance().getHomeController().panicExitInvoked();
                     return null;
                 });
-            } else if (pEventType.equals(M_DOWNLOAD_SINGLE)) {
+            } else if (pEventType.equals(M_DOWNLOAD_SINGLE) || pEventType.equals(M_DOWNLOAD_FILE) || pEventType.equals(M_DOWNLOAD_FILE_MANUAL)) {
+                Dexter.withContext(mHomeController.get())
+                        .withPermissions(
+                                Manifest.permission.CAMERA,
+                                Manifest.permission.READ_CONTACTS,
+                                Manifest.permission.MEDIA_CONTENT_CONTROL,
+                                Manifest.permission.MANAGE_MEDIA,
+                                Manifest.permission.ACCESS_MEDIA_LOCATION,
+                                Manifest.permission.READ_MEDIA_AUDIO,
+                                Manifest.permission.READ_MEDIA_VIDEO,
+                                Manifest.permission.READ_MEDIA_IMAGES,
+                                Manifest.permission.MANAGE_EXTERNAL_STORAGE,
+                                Manifest.permission.READ_EXTERNAL_STORAGE,
+                                Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                                Manifest.permission.RECORD_AUDIO
+                        ).withListener(new MultiplePermissionsListener() {
+                            @Override
+                            public void onPermissionsChecked(MultiplePermissionsReport multiplePermissionsReport) {
+                                if(pEventType.equals(M_DOWNLOAD_SINGLE)){
                                     if (pData != null) {
                                         if (pData.size() < 3) {
                                             ((homeController) mHomeController.get()).onManualDownload(pData.get(0).toString());
@@ -237,6 +262,21 @@ public class pluginController {
                                             }
                                         }
                                     }
+                                }
+                                if(pEventType.equals(M_DOWNLOAD_FILE)){
+                                    ((homeController) mHomeController.get()).onDownloadFile();
+                                }
+                                if(pEventType.equals(M_DOWNLOAD_FILE_MANUAL)){
+                                    ((homeController) mHomeController.get()).onManualDownload(pData.get(0).toString());
+                                }
+                            }
+
+                            @Override
+                            public void onPermissionRationaleShouldBeShown(List<PermissionRequest> list, PermissionToken permissionToken) {
+                                onMessageManagerInvoke(Collections.singletonList(this), M_OPEN_CICADA);
+                            }
+                        }).check();
+
             } else if (pEventType.equals(M_CANCEL_WELCOME)) {
                 status.sSettingIsWelcomeEnabled = false;
                 dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_IS_WELCOME_ENABLED, false));
@@ -261,10 +301,6 @@ public class pluginController {
                 return status.sBridgeCustomType;
             } else if (pEventType.equals(ON_FETCH_FAVICON)) {
                 activityContextManager.getInstance().getHomeController().onGetFavIcon((ImageView) pData.get(0), (String) pData.get(1));
-            } else if (pEventType.equals(M_DOWNLOAD_FILE)) {
-                ((homeController) mHomeController.get()).onDownloadFile();
-            } else if (pEventType.equals(M_DOWNLOAD_FILE_MANUAL)) {
-                ((homeController) mHomeController.get()).onManualDownload(pData.get(0).toString());
             } else if (pEventType.equals(M_LOAD_NEW_TAB)) {
                 ((homeController) mHomeController.get()).onLoadTabHidden(false, false, true, true);
             } else if (pEventType.equals(M_OPEN_LINK_NEW_TAB)) {

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

@@ -479,7 +479,7 @@
 
     <string name="PROXY_STATUS_HEADER" translatable="true">حالة الوكيل</string>
     <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">الحالة الحالية للوكيل المداري</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">حالة وكيل Genesis</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">حالة وكيل orion</string>
     <string name="PROXY_SUB_HEADER2" translatable="true">انین</string>
     <string name="PROXY_VPN_STATUS" translatable="true">شرط الاتصال بالسلاح</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">شرط وكيل الجسر</string>

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

@@ -322,8 +322,8 @@
     <string name="SETTING_ADVANCE_IMAGE_OPTION_3" translatable="true">bloqueja totes les imatges</string>
     <string name="SETTING_ADVANCE" translatable="true">Configuració avançada del sistema</string>
     <string name="SETTING_ADVANCE_INFO" translatable="true">restaurar pestanyes, estalvi de dades, eines per a desenvolupadors</string>
-    <string name="SETTING_PROXY" translatable="true">onion condició de representació</string>
+    <string name="SETTING_PROXY" translatable="true">orion condició de representació</string>
-    <string name="SETTING_PROXY_INFO" translatable="true">comproveu l\'estat de la xarxa onion</string>
+    <string name="SETTING_PROXY_INFO" translatable="true">comproveu l\'estat de la xarxa orion</string>
     <string name="SETTING_REPORT" translatable="true">lloc web d\'informes</string>
     <string name="SETTING_REPORT_INFO" translatable="true">lloc web d’informes abusius</string>
     <string name="SETTING_RATEUS" translatable="true">valora aquesta app</string>
@@ -480,9 +480,9 @@
 
 
     <string name="PROXY_STATUS_HEADER" translatable="true">condició del representant</string>
-    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">estat actual del proxy orbot</string>
+    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">estat actual del proxy orion</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">Orbot condició del representant</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">orion condició del representant</string>
-    <string name="PROXY_SUB_HEADER2" translatable="true">onion</string>
+    <string name="PROXY_SUB_HEADER2" translatable="true">orion</string>
     <string name="PROXY_VPN_STATUS" translatable="true">VPN condició de connectivitat</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">Bridge condició de representant</string>
     <string name="PROXY_SUB_HEADER3" translatable="true">info, canvieu la configuració del sistema</string>

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

@@ -334,8 +334,8 @@
     <string name="SETTING_ADVANCE_IMAGE_OPTION_3" translatable="true">blokovat všechny obrázky</string>
     <string name="SETTING_ADVANCE" translatable="true">Pokročilé nastavení systému</string>
     <string name="SETTING_ADVANCE_INFO" translatable="true">obnovit karty, spořič dat, vývojářské nástroje</string>
-    <string name="SETTING_PROXY" translatable="true">onion podmínka proxy</string>
+    <string name="SETTING_PROXY" translatable="true">orion podmínka proxy</string>
-    <string name="SETTING_PROXY_INFO" translatable="true">zkontrolujte stav sítě onion</string>
+    <string name="SETTING_PROXY_INFO" translatable="true">zkontrolujte stav sítě orion</string>
     <string name="SETTING_REPORT" translatable="true">nahlásit web</string>
     <string name="SETTING_REPORT_INFO" translatable="true">nahlásit nevhodný web</string>
     <string name="SETTING_RATEUS" translatable="true">Ohodnoťte tuto aplikaci</string>
@@ -478,8 +478,8 @@
 
     <string name="PROXY_STATUS_HEADER" translatable="true">podmínka plné moci</string>
     <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">aktuální stav 11122 proxy</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">Orbot podmínka proxy</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">orion podmínka proxy</string>
-    <string name="PROXY_SUB_HEADER2" translatable="true">onion</string>
+    <string name="PROXY_SUB_HEADER2" translatable="true">orion</string>
     <string name="PROXY_VPN_STATUS" translatable="true">VPN podmínka připojení</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">Bridge podmínka proxy</string>
     <string name="PROXY_SUB_HEADER3" translatable="true">informace | změnit nastavení systému</string>

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

@@ -334,8 +334,8 @@
     <string name="SETTING_ADVANCE_IMAGE_OPTION_3" translatable="true">Blockiere alle Bilder</string>
     <string name="SETTING_ADVANCE" translatable="true">Erweiterte Systemeinstellung</string>
     <string name="SETTING_ADVANCE_INFO" translatable="true">Tabs wiederherstellen, Daten sparen, Entwicklertools</string>
-    <string name="SETTING_PROXY" translatable="true">onion Proxy-Bedingung</string>
+    <string name="SETTING_PROXY" translatable="true">orion Proxy-Bedingung</string>
-    <string name="SETTING_PROXY_INFO" translatable="true">Überprüfen Sie den onion-Zustand des Netzwerks</string>
+    <string name="SETTING_PROXY_INFO" translatable="true">Überprüfen Sie den orion-Zustand des Netzwerks</string>
     <string name="SETTING_REPORT" translatable="true">report website</string>
     <string name="SETTING_REPORT_INFO" translatable="true">missbräuchliche Website melden</string>
     <string name="SETTING_RATEUS" translatable="true">Bewerte diese App</string>
@@ -478,9 +478,9 @@
 
 
     <string name="PROXY_STATUS_HEADER" translatable="true">Proxy-Bedingung</string>
-    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">aktueller Zustand von orbot Proxy</string>
+    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">aktueller Zustand von orion Proxy</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">Orbot Proxy-Bedingung</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">orion Proxy-Bedingung</string>
-    <string name="PROXY_SUB_HEADER2" translatable="true">onion</string>
+    <string name="PROXY_SUB_HEADER2" translatable="true">orion</string>
     <string name="PROXY_VPN_STATUS" translatable="true">VPN Konnektivitätsbedingung</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">Bridge Proxy-Bedingung</string>
     <string name="PROXY_SUB_HEADER3" translatable="true">info | Systemeinstellung ändern</string>

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

@@ -336,8 +336,8 @@
     <string name="SETTING_ADVANCE_IMAGE_OPTION_3" translatable="true">αποκλεισμός όλων των εικόνων</string>
     <string name="SETTING_ADVANCE" translatable="true">Ρύθμιση συστήματος εκ των προτέρων</string>
     <string name="SETTING_ADVANCE_INFO" translatable="true">επαναφορά καρτελών, εξοικονόμηση δεδομένων, εργαλεία προγραμματιστή</string>
-    <string name="SETTING_PROXY" translatable="true">onion συνθήκη διακομιστή μεσολάβησης</string>
+    <string name="SETTING_PROXY" translatable="true">orion συνθήκη διακομιστή μεσολάβησης</string>
-    <string name="SETTING_PROXY_INFO" translatable="true">ελέγξτε την κατάσταση του δικτύου onion</string>
+    <string name="SETTING_PROXY_INFO" translatable="true">ελέγξτε την κατάσταση του δικτύου orion</string>
     <string name="SETTING_REPORT" translatable="true">αναφέρετε τον ιστότοπο</string>
     <string name="SETTING_REPORT_INFO" translatable="true">αναφέρετε καταχρηστικό ιστότοπο</string>
     <string name="SETTING_RATEUS" translatable="true">βαθμολόγησε αυτήν την εφαρμογή</string>
@@ -480,9 +480,9 @@
 
 
     <string name="PROXY_STATUS_HEADER" translatable="true">κατάσταση του πληρεξούσιου</string>
-    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">τρέχουσα κατάσταση orbot διακομιστή μεσολάβησης</string>
+    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">τρέχουσα κατάσταση orion διακομιστή μεσολάβησης</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">Orbot συνθήκη διακομιστή μεσολάβησης</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">orion συνθήκη διακομιστή μεσολάβησης</string>
-    <string name="PROXY_SUB_HEADER2" translatable="true">onion</string>
+    <string name="PROXY_SUB_HEADER2" translatable="true">orion</string>
     <string name="PROXY_VPN_STATUS" translatable="true">VPN κατάσταση σύνδεσης</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">Bridge κατάσταση μεσολάβησης</string>
     <string name="PROXY_SUB_HEADER3" translatable="true">πληροφορίες | αλλαγή ρύθμισης συστήματος</string>

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

@@ -28,7 +28,7 @@
     <string name="HOME_DESCRIPTION_TEXT_5">Aucun cache local stocké</string>
     <string name="HOME_DESCRIPTION_TEXT_6">Cookies gérables sécurisés</string>
     <string name="HOME_DESCRIPTION_TEXT_7">Sécurisé par Tor Network</string>
-    <string name="HOME_DESCRIPTION_TEXT_8">Moteur de recherche Onion intégré</string>
+    <string name="HOME_DESCRIPTION_TEXT_8">Moteur de recherche Orion intégré</string>
     <string name="HOME_DESCRIPTION_TEXT_9">Aucun enregistrement et empreinte numérique</string>
     <string name="HOME_CONNECT_NO_TOR">Navigation normale</string>
     <string name="HOME_CONNECT_TOR">Naviguer sur Tor</string>
@@ -335,8 +335,8 @@
     <string name="SETTING_ADVANCE_IMAGE_OPTION_3" translatable="true">bloquer toutes les images</string>
     <string name="SETTING_ADVANCE" translatable="true">Paramètres système avancés</string>
     <string name="SETTING_ADVANCE_INFO" translatable="true">onglets de restauration, économiseur de données, outils de développement</string>
-    <string name="SETTING_PROXY" translatable="true">onion condition de proxy</string>
+    <string name="SETTING_PROXY" translatable="true">orion condition de proxy</string>
-    <string name="SETTING_PROXY_INFO" translatable="true">vérifier l\'état onion du réseau</string>
+    <string name="SETTING_PROXY_INFO" translatable="true">vérifier l\'état orion du réseau</string>
     <string name="SETTING_REPORT" translatable="true">rapport site Web</string>
     <string name="SETTING_REPORT_INFO" translatable="true">signaler un site Web abusif</string>
     <string name="SETTING_RATEUS" translatable="true">évaluer l\'application</string>
@@ -479,9 +479,9 @@
 
 
     <string name="PROXY_STATUS_HEADER" translatable="true">condition du proxy</string>
-    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">état actuel du proxy orbot</string>
+    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">état actuel du proxy orion</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">Orbot condition de procuration</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">orion condition de procuration</string>
-    <string name="PROXY_SUB_HEADER2" translatable="true">onion</string>
+    <string name="PROXY_SUB_HEADER2" translatable="true">orion</string>
     <string name="PROXY_VPN_STATUS" translatable="true">VPN état de la connectivité</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">Bridge condition de procuration</string>
     <string name="PROXY_SUB_HEADER3" translatable="true">info | modifier les paramètres système</string>

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

@@ -335,8 +335,8 @@
     <string name="SETTING_ADVANCE_IMAGE_OPTION_3" translatable="true">blokkolja az összes képet</string>
     <string name="SETTING_ADVANCE" translatable="true">A rendszer előzetes beállítása</string>
     <string name="SETTING_ADVANCE_INFO" translatable="true">fülek, adatmentő, fejlesztői eszközök helyreállítása</string>
-    <string name="SETTING_PROXY" translatable="true">onion a proxy feltétele</string>
+    <string name="SETTING_PROXY" translatable="true">orion a proxy feltétele</string>
-    <string name="SETTING_PROXY_INFO" translatable="true">ellenőrizze a hálózat onion állapotát</string>
+    <string name="SETTING_PROXY_INFO" translatable="true">ellenőrizze a hálózat orion állapotát</string>
     <string name="SETTING_REPORT" translatable="true">jelentés honlapja</string>
     <string name="SETTING_REPORT_INFO" translatable="true">visszaélésszerű webhely jelentése</string>
     <string name="SETTING_RATEUS" translatable="true">Értékeld ezt az alkalmazást</string>
@@ -479,9 +479,9 @@
 
 
     <string name="PROXY_STATUS_HEADER" translatable="true">a meghatalmazás feltétele</string>
-    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">a orbot proxy jelenlegi állapota</string>
+    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">a orion proxy jelenlegi állapota</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">A proxy Orbot feltétele</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">A proxy orion feltétele</string>
-    <string name="PROXY_SUB_HEADER2" translatable="true">onion</string>
+    <string name="PROXY_SUB_HEADER2" translatable="true">orion</string>
     <string name="PROXY_VPN_STATUS" translatable="true">VPN a kapcsolat feltétele</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">Bridge a proxy állapota</string>
     <string name="PROXY_SUB_HEADER3" translatable="true">info | a System Setting módosítása</string>

app/src/main/res/values-in-rID/strings.xml

@@ -19,12 +19,12 @@
     <!-- Home Splash Screen -->
     <string name="HOME_DESCRIPTION_TEXT_1">Diamankan oleh Jaringan Tor</string>
     <string name="HOME_DESCRIPTION_TEXT_2">Tanpa Rekam dan Sidik Jari Digital</string>
-    <string name="HOME_DESCRIPTION_TEXT_3">Mesin Pencari Onion bawaan</string>
+    <string name="HOME_DESCRIPTION_TEXT_3">Mesin Pencari Orion bawaan</string>
     <string name="HOME_DESCRIPTION_TEXT_4">Perlindungan Pelacakan</string>
     <string name="HOME_DESCRIPTION_TEXT_5">Tidak Ada Cache Lokal yang Tersimpan</string>
     <string name="HOME_DESCRIPTION_TEXT_6">Cookie Aman yang Dapat Dikelola</string>
     <string name="HOME_DESCRIPTION_TEXT_7">Diamankan oleh Jaringan Tor</string>
-    <string name="HOME_DESCRIPTION_TEXT_8">Mesin Pencari Onion bawaan</string>
+    <string name="HOME_DESCRIPTION_TEXT_8">Mesin Pencari Orion bawaan</string>
     <string name="HOME_DESCRIPTION_TEXT_9">Tanpa Rekam dan Sidik Jari Digital</string>
     <string name="HOME_CONNECT_NO_TOR">Penjelajahan Biasa</string>
     <string name="HOME_CONNECT_TOR">Penjelajahan Tor</string>
@@ -325,8 +325,8 @@
     <string name="SETTING_ADVANCE_IMAGE_OPTION_3" translatable="true">blokkeer alle afbeeldingen</string>
     <string name="SETTING_ADVANCE" translatable="true">Geavanceerde Systeeminstelling</string>
     <string name="SETTING_ADVANCE_INFO" translatable="true">tabbladen herstellen, gegevensbesparing, ontwikkelaarstools</string>
-    <string name="SETTING_PROXY" translatable="true">onion voorwaarde van volmacht</string>
+    <string name="SETTING_PROXY" translatable="true">orion voorwaarde van volmacht</string>
-    <string name="SETTING_PROXY_INFO" translatable="true">controleer onion conditie van netwerk</string>
+    <string name="SETTING_PROXY_INFO" translatable="true">controleer orion conditie van netwerk</string>
     <string name="SETTING_REPORT" translatable="true">rapport website</string>
     <string name="SETTING_REPORT_INFO" translatable="true">beledigende website melden</string>
     <string name="SETTING_RATEUS" translatable="true">beoordeel deze app</string>
@@ -469,9 +469,9 @@
 
     <!-- Proxy Status -->
     <string name="PROXY_STATUS_HEADER" translatable="true">inschakelen voorwaarde van volmacht</string>
-    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">huidige toestand van orbot proxy</string>
+    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">huidige toestand van orion proxy</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">Orbot voorwaarde van volmacht</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">orion voorwaarde van volmacht</string>
-    <string name="PROXY_SUB_HEADER2" translatable="true">onion Bridges status</string>
+    <string name="PROXY_SUB_HEADER2" translatable="true">orion Bridges status</string>
     <string name="PROXY_VPN_STATUS" translatable="true">VPN voorwaarde van connectiviteit</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">Bridge voorwaarde van volmacht</string>
     <string name="PROXY_SUB_HEADER3" translatable="true">info, wijzig Systeeminstelling</string>

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

@@ -23,12 +23,12 @@
     <!-- Home Splash Screen -->
     <string name="HOME_DESCRIPTION_TEXT_1">Protetto dalla rete Tor</string>
     <string name="HOME_DESCRIPTION_TEXT_2">Nessun record e impronte digitali</string>
-    <string name="HOME_DESCRIPTION_TEXT_3">Motore di ricerca Onion integrato</string>
+    <string name="HOME_DESCRIPTION_TEXT_3">Motore di ricerca Orion integrato</string>
     <string name="HOME_DESCRIPTION_TEXT_4">Protezione da tracciamento</string>
     <string name="HOME_DESCRIPTION_TEXT_5">Nessuna cache locale memorizzata</string>
     <string name="HOME_DESCRIPTION_TEXT_6">Cookie gestibili sicuri</string>
     <string name="HOME_DESCRIPTION_TEXT_7">Protetto dalla rete Tor</string>
-    <string name="HOME_DESCRIPTION_TEXT_8">Motore di ricerca Onion integrato</string>
+    <string name="HOME_DESCRIPTION_TEXT_8">Motore di ricerca Orion integrato</string>
     <string name="HOME_DESCRIPTION_TEXT_9">Nessun record e impronte digitali</string>
     <string name="HOME_CONNECT_NO_TOR">Navigazione normale</string>
     <string name="HOME_CONNECT_TOR">Navigazione Tor</string>
@@ -335,8 +335,8 @@
     <string name="SETTING_ADVANCE_IMAGE_OPTION_3" translatable="true">blocca tutte le immagini</string>
     <string name="SETTING_ADVANCE" translatable="true">Impostazioni avanzate del sistema</string>
     <string name="SETTING_ADVANCE_INFO" translatable="true">ripristinare schede, risparmio dati, strumenti per sviluppatori</string>
-    <string name="SETTING_PROXY" translatable="true">onion condizione di delega</string>
+    <string name="SETTING_PROXY" translatable="true">orion condizione di delega</string>
-    <string name="SETTING_PROXY_INFO" translatable="true">controllare onion stato della rete</string>
+    <string name="SETTING_PROXY_INFO" translatable="true">controllare orion stato della rete</string>
     <string name="SETTING_REPORT" translatable="true">sito web di report</string>
     <string name="SETTING_REPORT_INFO" translatable="true">segnalare un sito web offensivo</string>
     <string name="SETTING_RATEUS" translatable="true">valuta questa applicazione</string>
@@ -479,9 +479,9 @@
 
 
     <string name="PROXY_STATUS_HEADER" translatable="true">condizione di delega</string>
-    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">condizione attuale del proxy orbot</string>
+    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">condizione attuale del proxy orion</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">Orbot condizione di delega</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">orion condizione di delega</string>
-    <string name="PROXY_SUB_HEADER2" translatable="true">onion</string>
+    <string name="PROXY_SUB_HEADER2" translatable="true">orion</string>
     <string name="PROXY_VPN_STATUS" translatable="true">VPN condizione di connettività</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">Bridge condizione di delega</string>
     <string name="PROXY_SUB_HEADER3" translatable="true">info | modificare le impostazioni di sistema</string>

app/src/main/res/values-ja-rJP/strings.xml

@@ -334,8 +334,8 @@
     <string name="SETTING_ADVANCE_IMAGE_OPTION_3" translatable="true">すべての画像をブロックする</string>
     <string name="SETTING_ADVANCE" translatable="true">事前システム設定</string>
     <string name="SETTING_ADVANCE_INFO" translatable="true">復元タブ、データセーバー、開発者ツール</string>
-    <string name="SETTING_PROXY" translatable="true">プロキシのonion条件</string>
+    <string name="SETTING_PROXY" translatable="true">プロキシのorion条件</string>
-    <string name="SETTING_PROXY_INFO" translatable="true">ネットワークのonion状態を確認してください</string>
+    <string name="SETTING_PROXY_INFO" translatable="true">ネットワークのorion状態を確認してください</string>
     <string name="SETTING_REPORT" translatable="true">レポートのウェブサイト</string>
     <string name="SETTING_REPORT_INFO" translatable="true">虐待的なウェブサイトを報告する</string>
     <string name="SETTING_RATEUS" translatable="true">このアプリを評価する</string>
@@ -478,9 +478,9 @@
 
 
     <string name="PROXY_STATUS_HEADER" translatable="true">プロキシの状態</string>
-    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">orbotプロキシの現状</string>
+    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">orionプロキシの現状</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">Orbotプロキシの条件</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">orionプロキシの条件</string>
-    <string name="PROXY_SUB_HEADER2" translatable="true">onion</string>
+    <string name="PROXY_SUB_HEADER2" translatable="true">orion</string>
     <string name="PROXY_VPN_STATUS" translatable="true">VPN接続状態</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">プロキシのBridge条件</string>
     <string name="PROXY_SUB_HEADER3" translatable="true">情報|システム設定の変更</string>

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

@@ -334,8 +334,8 @@
     <string name="SETTING_ADVANCE_IMAGE_OPTION_3" translatable="true">모든 이미지 차단</string>
     <string name="SETTING_ADVANCE" translatable="true">고급 시스템 설정</string>
     <string name="SETTING_ADVANCE_INFO" translatable="true">복원 탭, 데이터 세이버, 개발자 도구</string>
-    <string name="SETTING_PROXY" translatable="true">onion 대리 조건</string>
+    <string name="SETTING_PROXY" translatable="true">orion 대리 조건</string>
-    <string name="SETTING_PROXY_INFO" translatable="true">onion 네트워크 상태 확인</string>
+    <string name="SETTING_PROXY_INFO" translatable="true">orion 네트워크 상태 확인</string>
     <string name="SETTING_REPORT" translatable="true">웹 사이트 신고</string>
     <string name="SETTING_REPORT_INFO" translatable="true">악성 웹 사이트 신고</string>
     <string name="SETTING_RATEUS" translatable="true">이 앱을 평가 해주십시오</string>
@@ -478,9 +478,9 @@
 
 
     <string name="PROXY_STATUS_HEADER" translatable="true">대리 조건</string>
-    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">orbot 프록시의 현재 상태</string>
+    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">orion 프록시의 현재 상태</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">Orbot 대리 조건</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">orion 대리 조건</string>
-    <string name="PROXY_SUB_HEADER2" translatable="true">onion</string>
+    <string name="PROXY_SUB_HEADER2" translatable="true">orion</string>
     <string name="PROXY_VPN_STATUS" translatable="true">VPN 연결 상태</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">Bridge 대리 조건</string>
     <string name="PROXY_SUB_HEADER3" translatable="true">정보 | 시스템 설정 변경</string>

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

@@ -19,12 +19,12 @@
     <!-- Home Splash Screen -->
     <string name="HOME_DESCRIPTION_TEXT_1">Beveiligd door Tor-netwerk</string>
     <string name="HOME_DESCRIPTION_TEXT_2">Geen opname en digitale vingerafdrukken</string>
-    <string name="HOME_DESCRIPTION_TEXT_3">Ingebouwde Onion-zoekmachine</string>
+    <string name="HOME_DESCRIPTION_TEXT_3">Ingebouwde Orion-zoekmachine</string>
     <string name="HOME_DESCRIPTION_TEXT_4">Bescherming tegen volgen</string>
     <string name="HOME_DESCRIPTION_TEXT_5">Geen lokale cache opgeslagen</string>
     <string name="HOME_DESCRIPTION_TEXT_6">Veilige beheerbare cookies</string>
     <string name="HOME_DESCRIPTION_TEXT_7">Beveiligd door Tor-netwerk</string>
-    <string name="HOME_DESCRIPTION_TEXT_8">Ingebouwde Onion-zoekmachine</string>
+    <string name="HOME_DESCRIPTION_TEXT_8">Ingebouwde Orion-zoekmachine</string>
     <string name="HOME_DESCRIPTION_TEXT_9">Geen opname en digitale vingerafdrukken</string>
     <string name="HOME_CONNECT_NO_TOR">Normaal browsen</string>
     <string name="HOME_CONNECT_TOR">Tor browsen</string>
@@ -323,7 +323,7 @@
     <string name="SETTING_ADVANCE_IMAGE_OPTION_3" translatable="true">Blokkeer alle afbeeldingen</string>
     <string name="SETTING_ADVANCE" translatable="true">Geavanceerd</string>
     <string name="SETTING_ADVANCE_INFO" translatable="true">Herstel tabbladen, databesparing, ontwikkelaarstools</string>
-    <string name="SETTING_PROXY" translatable="true">Onion Proxy-status</string>
+    <string name="SETTING_PROXY" translatable="true">orion Proxy-status</string>
     <string name="SETTING_PROXY_INFO" translatable="true">Controleer uienetwerk of status</string>
     <string name="SETTING_REPORT" translatable="true">Rapport website</string>
     <string name="SETTING_REPORT_INFO" translatable="true">Beledigende website melden</string>
@@ -470,8 +470,8 @@
 
     <!-- Proxy Status -->
     <string name="PROXY_STATUS_HEADER" translatable="true">Proxystatus</string>
-    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">Huidige status van orbot-proxy</string>
+    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">Huidige status van orion-proxy</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">Orbot-proxystatus</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">orion-proxystatus</string>
     <string name="PROXY_SUB_HEADER2" translatable="true">Ui Bruggen Status</string>
     <string name="PROXY_VPN_STATUS" translatable="true">VPN-verbindingsstatus</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">Bridge-verbindingsstatus</string>

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

@@ -23,12 +23,12 @@
     <!-- Home Splash Screen -->
     <string name="HOME_DESCRIPTION_TEXT_1">Protegido pela Rede Tor</string>
     <string name="HOME_DESCRIPTION_TEXT_2">Sem registro e impressão digital</string>
-    <string name="HOME_DESCRIPTION_TEXT_3">Mecanismo de busca Onion integrado</string>
+    <string name="HOME_DESCRIPTION_TEXT_3">Mecanismo de busca Orion integrado</string>
     <string name="HOME_DESCRIPTION_TEXT_4">Proteção de rastreamento</string>
     <string name="HOME_DESCRIPTION_TEXT_5">Nenhum cache local armazenado</string>
     <string name="HOME_DESCRIPTION_TEXT_6">Cookies gerenciáveis ​​seguros</string>
     <string name="HOME_DESCRIPTION_TEXT_7">Protegido pela Rede Tor</string>
-    <string name="HOME_DESCRIPTION_TEXT_8">Mecanismo de busca Onion integrado</string>
+    <string name="HOME_DESCRIPTION_TEXT_8">Mecanismo de busca Orion integrado</string>
     <string name="HOME_DESCRIPTION_TEXT_9">Sem registro e impressão digital</string>
     <string name="HOME_CONNECT_NO_TOR">Navegação Normal</string>
     <string name="HOME_CONNECT_TOR">Navegação Tor</string>
@@ -335,8 +335,8 @@
     <string name="SETTING_ADVANCE_IMAGE_OPTION_3" translatable="true">bloquear todas as imagens</string>
     <string name="SETTING_ADVANCE" translatable="true">Configuração avançada do sistema</string>
     <string name="SETTING_ADVANCE_INFO" translatable="true">restaurar guias, economia de dados, ferramentas de desenvolvedor</string>
-    <string name="SETTING_PROXY" translatable="true">onion condição de procuração</string>
+    <string name="SETTING_PROXY" translatable="true">orion condição de procuração</string>
-    <string name="SETTING_PROXY_INFO" translatable="true">verificar a condição onion da rede</string>
+    <string name="SETTING_PROXY_INFO" translatable="true">verificar a condição orion da rede</string>
     <string name="SETTING_REPORT" translatable="true">site do relatório</string>
     <string name="SETTING_REPORT_INFO" translatable="true">denunciar site abusivo</string>
     <string name="SETTING_RATEUS" translatable="true">Avalie este aplicativo</string>
@@ -479,9 +479,9 @@
 
 
     <string name="PROXY_STATUS_HEADER" translatable="true">condição de procuração</string>
-    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">condição atual do proxy orbot</string>
+    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">condição atual do proxy orion</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">Orbot condição de procuração</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">orion condição de procuração</string>
-    <string name="PROXY_SUB_HEADER2" translatable="true">onion</string>
+    <string name="PROXY_SUB_HEADER2" translatable="true">orion</string>
     <string name="PROXY_VPN_STATUS" translatable="true">VPN condição de conectividade</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">Bridge condição de procuração</string>
     <string name="PROXY_SUB_HEADER3" translatable="true">informações | alterar configuração do sistema</string>

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

@@ -335,8 +335,8 @@
     <string name="SETTING_ADVANCE_IMAGE_OPTION_3" translatable="true">blocați toate imaginile</string>
     <string name="SETTING_ADVANCE" translatable="true">Setare avansată a sistemului</string>
     <string name="SETTING_ADVANCE_INFO" translatable="true">filele de restaurare, economisirea datelor, instrumentele pentru dezvoltatori</string>
-    <string name="SETTING_PROXY" translatable="true">onion condiția împuternicirii</string>
+    <string name="SETTING_PROXY" translatable="true">orion condiția împuternicirii</string>
-    <string name="SETTING_PROXY_INFO" translatable="true">verificați starea rețelei onion</string>
+    <string name="SETTING_PROXY_INFO" translatable="true">verificați starea rețelei orion</string>
     <string name="SETTING_REPORT" translatable="true">raportați site-ul web</string>
     <string name="SETTING_REPORT_INFO" translatable="true">raportează site-ul abuziv</string>
     <string name="SETTING_RATEUS" translatable="true">evalueaza aceasta aplicatie</string>
@@ -479,9 +479,9 @@
 
 
     <string name="PROXY_STATUS_HEADER" translatable="true">condiția împuternicirii</string>
-    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">starea actuală a proxy-ului orbot</string>
+    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">starea actuală a proxy-ului orion</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">Orbot condiția împuternicirii</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">orion condiția împuternicirii</string>
-    <string name="PROXY_SUB_HEADER2" translatable="true">onion</string>
+    <string name="PROXY_SUB_HEADER2" translatable="true">orion</string>
     <string name="PROXY_VPN_STATUS" translatable="true">VPN starea conectivității</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">Bridge condiția împuternicirii</string>
     <string name="PROXY_SUB_HEADER3" translatable="true">info | modificați Setarea sistemului</string>

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

@@ -334,8 +334,8 @@
     <string name="SETTING_ADVANCE_IMAGE_OPTION_3" translatable="true">заблокировать все изображения</string>
     <string name="SETTING_ADVANCE" translatable="true">Расширенные настройки системы</string>
     <string name="SETTING_ADVANCE_INFO" translatable="true">восстановить вкладки, хранитель данных, инструменты разработчика</string>
-    <string name="SETTING_PROXY" translatable="true">onion состояние прокси</string>
+    <string name="SETTING_PROXY" translatable="true">orion состояние прокси</string>
-    <string name="SETTING_PROXY_INFO" translatable="true">проверить onion состояние сети</string>
+    <string name="SETTING_PROXY_INFO" translatable="true">проверить orion состояние сети</string>
     <string name="SETTING_REPORT" translatable="true">веб-сайт отчета</string>
     <string name="SETTING_REPORT_INFO" translatable="true">сообщить о нарушении веб-сайта</string>
     <string name="SETTING_RATEUS" translatable="true">Оцените это приложение</string>
@@ -478,9 +478,9 @@
 
 
     <string name="PROXY_STATUS_HEADER" translatable="true">состояние доверенности</string>
-    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">текущее состояние прокси orbot</string>
+    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">текущее состояние прокси orion</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">Orbot состояние прокси</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">orion состояние прокси</string>
-    <string name="PROXY_SUB_HEADER2" translatable="true">onion</string>
+    <string name="PROXY_SUB_HEADER2" translatable="true">orion</string>
     <string name="PROXY_VPN_STATUS" translatable="true">VPN состояние подключения</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">Bridge состояние прокси</string>
     <string name="PROXY_SUB_HEADER3" translatable="true">информация | изменить настройки системы</string>

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

@@ -334,8 +334,8 @@
     <string name="SETTING_ADVANCE_IMAGE_OPTION_3" translatable="true">บล็อกภาพทั้งหมด</string>
     <string name="SETTING_ADVANCE" translatable="true">การตั้งค่าระบบขั้นสูง</string>
     <string name="SETTING_ADVANCE_INFO" translatable="true">กู้คืนแท็บโปรแกรมประหยัดข้อมูลเครื่องมือสำหรับนักพัฒนา</string>
-    <string name="SETTING_PROXY" translatable="true">onion เงื่อนไขการมอบฉันทะ</string>
+    <string name="SETTING_PROXY" translatable="true">orion เงื่อนไขการมอบฉันทะ</string>
-    <string name="SETTING_PROXY_INFO" translatable="true">ตรวจสอบสภาพเครือข่าย onion</string>
+    <string name="SETTING_PROXY_INFO" translatable="true">ตรวจสอบสภาพเครือข่าย orion</string>
     <string name="SETTING_REPORT" translatable="true">รายงานเว็บไซต์</string>
     <string name="SETTING_REPORT_INFO" translatable="true">รายงานเว็บไซต์ที่ไม่เหมาะสม</string>
     <string name="SETTING_RATEUS" translatable="true">ให้คะแนนแอปนี้</string>
@@ -478,9 +478,9 @@
 
 
     <string name="PROXY_STATUS_HEADER" translatable="true">เงื่อนไขของพร็อกซี</string>
-    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">สภาพปัจจุบันของ orbot proxy</string>
+    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">สภาพปัจจุบันของ orion proxy</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">Orbot เงื่อนไขของพร็อกซี</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">orion เงื่อนไขของพร็อกซี</string>
-    <string name="PROXY_SUB_HEADER2" translatable="true">onion</string>
+    <string name="PROXY_SUB_HEADER2" translatable="true">orion</string>
     <string name="PROXY_VPN_STATUS" translatable="true">VPN เงื่อนไขการเชื่อมต่อ</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">Bridge เงื่อนไขของการมอบฉันทะ</string>
     <string name="PROXY_SUB_HEADER3" translatable="true">ข้อมูล | เปลี่ยนการตั้งค่าระบบ</string>

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

@@ -335,8 +335,8 @@
     <string name="SETTING_ADVANCE_IMAGE_OPTION_3" translatable="true">tüm resimleri engelle</string>
     <string name="SETTING_ADVANCE" translatable="true">Gelişmiş Sistem Ayarı</string>
     <string name="SETTING_ADVANCE_INFO" translatable="true">sekmeleri geri yükle, veri tasarrufu, geliştirici araçları</string>
-    <string name="SETTING_PROXY" translatable="true">onion vekalet koşulu</string>
+    <string name="SETTING_PROXY" translatable="true">orion vekalet koşulu</string>
-    <string name="SETTING_PROXY_INFO" translatable="true">onion ağ durumunu kontrol et</string>
+    <string name="SETTING_PROXY_INFO" translatable="true">orion ağ durumunu kontrol et</string>
     <string name="SETTING_REPORT" translatable="true">web sitesini bildir</string>
     <string name="SETTING_REPORT_INFO" translatable="true">kötüye kullanılan web sitesini bildir</string>
     <string name="SETTING_RATEUS" translatable="true">bu uygulamayı oyla</string>
@@ -479,9 +479,9 @@
 
 
     <string name="PROXY_STATUS_HEADER" translatable="true">vekaletname durumu</string>
-    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">orbot vekilinin mevcut durumu</string>
+    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">orion vekilinin mevcut durumu</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">Orbot vekalet koşulu</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">orion vekalet koşulu</string>
-    <string name="PROXY_SUB_HEADER2" translatable="true">onion</string>
+    <string name="PROXY_SUB_HEADER2" translatable="true">orion</string>
     <string name="PROXY_VPN_STATUS" translatable="true">VPN bağlantı durumu</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">Bridge vekalet koşulu</string>
     <string name="PROXY_SUB_HEADER3" translatable="true">bilgi | Sistem Ayarını değiştir</string>

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

@@ -472,7 +472,7 @@
     <!-- Proxy Status -->
     <string name="PROXY_STATUS_HEADER" translatable="true">Статус проксі</string>
     <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">Поточний стан проксі-провайдера</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">Статус проксі Orbot</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">Статус проксі orion</string>
     <string name="PROXY_SUB_HEADER2" translatable="true">Цибуля Статус мостів</string>
     <string name="PROXY_VPN_STATUS" translatable="true">Стан підключення до VPN</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">Статус підключення мосту</string>

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

@@ -332,8 +332,8 @@
     <string name="SETTING_ADVANCE_IMAGE_OPTION_3" translatable="true">chặn tất cả hình ảnh</string>
     <string name="SETTING_ADVANCE" translatable="true">Cài đặt hệ thống nâng cao</string>
     <string name="SETTING_ADVANCE_INFO" translatable="true">khôi phục các tab, trình tiết kiệm dữ liệu, công cụ dành cho nhà phát triển</string>
-    <string name="SETTING_PROXY" translatable="true">onion điều kiện của proxy</string>
+    <string name="SETTING_PROXY" translatable="true">orion điều kiện của proxy</string>
-    <string name="SETTING_PROXY_INFO" translatable="true">kiểm tra điều kiện mạng onion</string>
+    <string name="SETTING_PROXY_INFO" translatable="true">kiểm tra điều kiện mạng orion</string>
     <string name="SETTING_REPORT" translatable="true">báo cáo trang web</string>
     <string name="SETTING_REPORT_INFO" translatable="true">báo cáo trang web lạm dụng</string>
     <string name="SETTING_RATEUS" translatable="true">đánh giá ứng dụng này</string>
@@ -476,9 +476,9 @@
 
 
     <string name="PROXY_STATUS_HEADER" translatable="true">điều kiện của proxy</string>
-    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">tình trạng hiện tại của orbot proxy</string>
+    <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">tình trạng hiện tại của orion proxy</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">Orbot điều kiện của proxy</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">orion điều kiện của proxy</string>
-    <string name="PROXY_SUB_HEADER2" translatable="true">onion</string>
+    <string name="PROXY_SUB_HEADER2" translatable="true">orion</string>
     <string name="PROXY_VPN_STATUS" translatable="true">VPN điều kiện kết nối</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">Bridge điều kiện của proxy</string>
     <string name="PROXY_SUB_HEADER3" translatable="true">thông tin | thay đổi cài đặt hệ thống</string>

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

@@ -332,8 +332,8 @@
     <string name="SETTING_ADVANCE_IMAGE_OPTION_3" translatable="true">封锁所有图片</string>
     <string name="SETTING_ADVANCE" translatable="true">进阶系统设定</string>
     <string name="SETTING_ADVANCE_INFO" translatable="true">还原标签，数据保护程序，开发人员工具</string>
-    <string name="SETTING_PROXY" translatable="true">onion代理条件</string>
+    <string name="SETTING_PROXY" translatable="true">orion代理条件</string>
-    <string name="SETTING_PROXY_INFO" translatable="true">检查onion网络状况</string>
+    <string name="SETTING_PROXY_INFO" translatable="true">检查orion网络状况</string>
     <string name="SETTING_REPORT" translatable="true">报告网站</string>
     <string name="SETTING_REPORT_INFO" translatable="true">举报滥用网站</string>
     <string name="SETTING_RATEUS" translatable="true">为这个应用软件评分</string>
@@ -477,8 +477,8 @@
 
     <string name="PROXY_STATUS_HEADER" translatable="true">委托条件</string>
     <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">Gateway 代理的当前状况</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">Orbot委托条件</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">orion委托条件</string>
-    <string name="PROXY_SUB_HEADER2" translatable="true">Orbot</string>
+    <string name="PROXY_SUB_HEADER2" translatable="true">orion</string>
     <string name="PROXY_VPN_STATUS" translatable="true">VPN的连接条件</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">Bridge代理条件</string>
     <string name="PROXY_SUB_HEADER3" translatable="true">信息|更改系统设置</string>

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

@@ -39,12 +39,12 @@
     <!-- Home Splash Screen -->
     <string name="HOME_DESCRIPTION_TEXT_1">Secured by Tor Network</string>
     <string name="HOME_DESCRIPTION_TEXT_2">No Record and Digital Fingerprinting</string>
-    <string name="HOME_DESCRIPTION_TEXT_3">Builtin Onion Search Engine</string>
+    <string name="HOME_DESCRIPTION_TEXT_3">Builtin Orion Search Engine</string>
     <string name="HOME_DESCRIPTION_TEXT_4">Tracking Protection</string>
     <string name="HOME_DESCRIPTION_TEXT_5">No Local Cache Stored</string>
     <string name="HOME_DESCRIPTION_TEXT_6">Secure Manageable Cookies</string>
     <string name="HOME_DESCRIPTION_TEXT_7">Secured by Tor Network</string>
-    <string name="HOME_DESCRIPTION_TEXT_8">Builtin Onion Search Engine</string>
+    <string name="HOME_DESCRIPTION_TEXT_8">Builtin Orion Search Engine</string>
     <string name="HOME_DESCRIPTION_TEXT_9">No Record and Digital Fingerprinting</string>
     <string name="HOME_CONNECT_NO_TOR">Fast &amp; Secure</string>
     <string name="HOME_CONNECT_TOR">Dark Web - VPN</string>
@@ -362,8 +362,8 @@
     <string name="SETTING_ADVANCE_IMAGE_OPTION_3" translatable="true">Block all images</string>
     <string name="SETTING_ADVANCE" translatable="true">Advanced</string>
     <string name="SETTING_ADVANCE_INFO" translatable="true">Restore tabs, data saver, developer tools</string>
-    <string name="SETTING_PROXY" translatable="true">Onion Proxy Status</string>
+    <string name="SETTING_PROXY" translatable="true">Orion Proxy Status</string>
-    <string name="SETTING_PROXY_INFO" translatable="true">Check onion network or status</string>
+    <string name="SETTING_PROXY_INFO" translatable="true">Check orion network or status</string>
     <string name="SETTING_REPORT" translatable="true">Report website</string>
     <string name="SETTING_PRIVACY_POLICY" translatable="true">Privacy Policy</string>
     <string name="SETTING_PRIVACY_POLICY_INFO" translatable="true">Orion browser privacy policy</string>
@@ -524,8 +524,8 @@
     <!-- Proxy Status -->
     <string name="PROXY_STATUS_HEADER" translatable="true">Proxy Status</string>
     <string name="ORBOT_PROXY_STATUS_INFO" translatable="true">Current status of orbot proxy</string>
-    <string name="PROXY_SUB_HEADER1" translatable="true">Orbot Proxy Status</string>
+    <string name="PROXY_SUB_HEADER1" translatable="true">orion Proxy Status</string>
-    <string name="PROXY_SUB_HEADER2" translatable="true">Onion &amp; Bridges Status</string>
+    <string name="PROXY_SUB_HEADER2" translatable="true">orion &amp; Bridges Status</string>
     <string name="PROXY_VPN_STATUS" translatable="true">VPN connectivity status</string>
     <string name="PROXY_BRIDGE_STATUS" translatable="true">Bridge connectivity status</string>
     <string name="PROXY_SUB_HEADER3" translatable="true">INFO | Change Settings</string>

orbotmanager/src/main/java/org/torproject/android/service/wrapper/orbotLocalConstants.java

@@ -31,6 +31,7 @@ public class orbotLocalConstants
     public static String mInitUpdateBridgeList = "";
     public static boolean mInitUpdateVPN = false;
     public static boolean mAppTriggered = false;
+    public static boolean mSoftNotification = false;
 
     public static int mHTTPPort = 8118;
     public static int mSOCKSPort = -1;

orbotmanager/src/main/res/raw-fa/bridges.txt

@@ -1,15 +0,0 @@
-obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0
-obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1
-obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0
-obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0
-obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0
-obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0
-obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0
-obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1
-obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1
-obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0
-obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0
-obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0
-obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0
-meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com
-snowflake 192.0.2.3:1