From 753437484869ef1dcb6163c9f34a0e5a2847d37a Mon Sep 17 00:00:00 2001
From: R4SAS <r4sas@i2pmail.org>
Date: Mon, 10 Dec 2018 10:02:19 +0300
Subject: [PATCH] remove orbot proxy selection, update about menu

---
 .../org/purplei2p/lightning/constant/Constants.java  |  7 +++----
 .../lightning/preference/PreferenceManager.java      |  2 --
 .../settings/fragment/GeneralSettingsFragment.java   |  3 ---
 .../org/purplei2p/lightning/utils/ProxyUtils.java    | 12 ------------
 app/src/main/res/values-ru/strings.xml               |  8 ++------
 app/src/main/res/values/strings.xml                  |  8 ++------
 app/src/main/res/xml/preference_about.xml            |  6 +++---
 app/src/main/res/xml/preferences_headers.xml         | 11 -----------
 8 files changed, 10 insertions(+), 47 deletions(-)

diff --git a/app/src/main/java/org/purplei2p/lightning/constant/Constants.java b/app/src/main/java/org/purplei2p/lightning/constant/Constants.java
index a98ae38..4241cec 100644
--- a/app/src/main/java/org/purplei2p/lightning/constant/Constants.java
+++ b/app/src/main/java/org/purplei2p/lightning/constant/Constants.java
@@ -57,14 +57,13 @@ public final class Constants {
     public static final String FOLDER = "folder://";
 
     // These should match the order of @array/proxy_choices_array
-    @IntDef({NO_PROXY, PROXY_ORBOT, PROXY_I2P, PROXY_MANUAL})
+    @IntDef({NO_PROXY, PROXY_I2P, PROXY_MANUAL})
     @Retention(RetentionPolicy.SOURCE)
     public @interface Proxy {}
 
     public static final int NO_PROXY = 0;
-    public static final int PROXY_ORBOT = 1;
-    public static final int PROXY_I2P = 2;
-    public static final int PROXY_MANUAL = 3;
+    public static final int PROXY_I2P = 1;
+    public static final int PROXY_MANUAL = 2;
 
     // Default text encoding we will use
     public static final String DEFAULT_ENCODING = "UTF-8";
diff --git a/app/src/main/java/org/purplei2p/lightning/preference/PreferenceManager.java b/app/src/main/java/org/purplei2p/lightning/preference/PreferenceManager.java
index e5ebd03..786f076 100644
--- a/app/src/main/java/org/purplei2p/lightning/preference/PreferenceManager.java
+++ b/app/src/main/java/org/purplei2p/lightning/preference/PreferenceManager.java
@@ -232,7 +232,6 @@ public class PreferenceManager {
         @Constants.Proxy int proxy = mPrefs.getInt(Name.PROXY_CHOICE, Constants.PROXY_I2P);
         switch (proxy) {
             case Constants.NO_PROXY:
-            case Constants.PROXY_ORBOT:
             case Constants.PROXY_I2P:
             case Constants.PROXY_MANUAL:
                 return proxy;
@@ -431,7 +430,6 @@ public class PreferenceManager {
      * Valid choices:
      * <ul>
      * <li>{@link Constants#NO_PROXY}</li>
-     * <li>{@link Constants#PROXY_ORBOT}</li>
      * <li>{@link Constants#PROXY_I2P}</li>
      * </ul>
      *
diff --git a/app/src/main/java/org/purplei2p/lightning/settings/fragment/GeneralSettingsFragment.java b/app/src/main/java/org/purplei2p/lightning/settings/fragment/GeneralSettingsFragment.java
index 9cae9be..7c2fad1 100644
--- a/app/src/main/java/org/purplei2p/lightning/settings/fragment/GeneralSettingsFragment.java
+++ b/app/src/main/java/org/purplei2p/lightning/settings/fragment/GeneralSettingsFragment.java
@@ -194,9 +194,6 @@ public class GeneralSettingsFragment extends LightningPreferenceFragment impleme
 
     private void setProxyChoice(@Constants.Proxy int choice) {
         switch (choice) {
-            case Constants.PROXY_ORBOT:
-                choice = ProxyUtils.setProxyChoice(choice, mActivity);
-                break;
             case Constants.PROXY_I2P:
                 choice = ProxyUtils.setProxyChoice(choice, mActivity);
                 break;
diff --git a/app/src/main/java/org/purplei2p/lightning/utils/ProxyUtils.java b/app/src/main/java/org/purplei2p/lightning/utils/ProxyUtils.java
index 6a1cfd8..ccf8cef 100644
--- a/app/src/main/java/org/purplei2p/lightning/utils/ProxyUtils.java
+++ b/app/src/main/java/org/purplei2p/lightning/utils/ProxyUtils.java
@@ -40,10 +40,6 @@ public class ProxyUtils {
             case Constants.NO_PROXY:
                 // We shouldn't be here
                 return;
-            case Constants.PROXY_ORBOT:
-                host = "localhost";
-                port = 8118;
-                break;
             case Constants.PROXY_I2P:
                 host = "localhost";
                 port = 4444;
@@ -82,14 +78,6 @@ public class ProxyUtils {
 
     @Constants.Proxy
     public static int setProxyChoice(int choice, @NonNull Activity activity) {
-        switch (choice) {
-            case Constants.PROXY_ORBOT:
-                break;
-            case Constants.PROXY_I2P:
-                break;
-            case Constants.PROXY_MANUAL:
-                break;
-        }
         return choice;
     }
 }
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 693520b..015ac22 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -93,8 +93,8 @@
     <string name="download_sdcard_busy_dlg_title">Карта памяти недоступна</string>
     <string name="download_sdcard_busy_dlg_msg">Карта памяти подключена к ПК. Для начала загрузки отключите её от ПК, нажав на уведомление.</string>
     <string name="incognito_cookies">Включить куки в режиме инкогнито</string>
-    <string name="action_follow_me">Связаться с разработчиками</string>
-    <string name="url_twitter">twitter.com/RestainoAnthony</string>
+    <string name="bugtracker">Багтрекер</string>
+    <string name="bugtracker_title">Сообщить о проблеме можно здесь</string>
     <string name="clear_cache">Очистить кэш</string>
     <string name="message_cache_cleared">Кэш очищен</string>
     <string name="message_import">Закладки импортированы</string>
@@ -126,7 +126,6 @@
     <string name="http_proxy">HTTP прокси</string>
     <string-array name="proxy_choices_array">
         <item>Нет</item>
-        <item>Orbot</item>
         <item>I2P</item>
         <item>Вручную</item>
     </string-array>
@@ -208,9 +207,6 @@
     <string name="action_delete_all_bookmarks">Удалить все закладки</string>
     <string name="message_open_download_fail">Не удалось открыть файл</string>
 
-    <string name="faq">FAQ</string>
-    <string name="faq_description">Часто задаваемые вопросы</string>
-
     <!-- debug strings -->
     <string name="debug_title">Настройки отладки</string>
     <string name="debug_leak_canary">LeakCanary</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1a1bdb6..436e761 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -93,8 +93,8 @@
     <string name="download_sdcard_busy_dlg_title">USB storage unavailable</string>
     <string name="download_sdcard_busy_dlg_msg">The storage is busy. To allow downloads, touch \'Turn Off USB Storage\' in the notification.</string>
     <string name="incognito_cookies">Enable cookies in incognito mode</string>
-    <string name="action_follow_me">Contact me</string>
-    <string name="url_twitter">twitter.com/RestainoAnthony</string>
+    <string name="bugtracker">Bugtracker</string>
+    <string name="bugtracker_title">You can report issues here</string>
     <string name="clear_cache">Clear cache</string>
     <string name="message_cache_cleared">Cache cleared</string>
     <string name="message_import">Bookmarks were imported</string>
@@ -126,7 +126,6 @@
     <string name="http_proxy">HTTP proxy</string>
     <string-array name="proxy_choices_array">
         <item>None</item>
-        <item>Orbot</item>
         <item>I2P</item>
         <item>Manual</item>
     </string-array>
@@ -208,9 +207,6 @@
     <string name="action_delete_all_bookmarks">Delete all bookmarks</string>
     <string name="message_open_download_fail">This file doesn\'t exist anymore</string>
 
-    <string name="faq">FAQ</string>
-    <string name="faq_description">Frequently asked questions</string>
-
     <!-- debug strings -->
     <string name="debug_title">Debug Settings</string>
     <string name="debug_leak_canary">LeakCanary</string>
diff --git a/app/src/main/res/xml/preference_about.xml b/app/src/main/res/xml/preference_about.xml
index 9c243d0..9c6dc22 100644
--- a/app/src/main/res/xml/preference_about.xml
+++ b/app/src/main/res/xml/preference_about.xml
@@ -4,11 +4,11 @@
 
     <PreferenceCategory android:title="@string/settings_about">
         <Preference
-            android:summary="@string/url_twitter"
-            android:title="@string/action_follow_me">
+            android:summary="@string/bugtracker"
+            android:title="@string/bugtracker_title">
             <intent
                 android:action="android.intent.action.VIEW"
-                android:data="http://twitter.com/RestainoAnthony">
+                android:data="https://gitlab.i2pd.xyz/r4sas/lightning-i2p/issues">
                 <extra
                     android:name="SOURCE"
                     android:value="SELF" />
diff --git a/app/src/main/res/xml/preferences_headers.xml b/app/src/main/res/xml/preferences_headers.xml
index 332cba8..e09bae2 100644
--- a/app/src/main/res/xml/preferences_headers.xml
+++ b/app/src/main/res/xml/preferences_headers.xml
@@ -19,17 +19,6 @@
         android:fragment="org.purplei2p.lightning.settings.fragment.AboutSettingsFragment"
         android:summary="@string/settings_about_explain"
         android:title="@string/settings_about"/>
-    <header
-        android:summary="@string/faq_description"
-        android:title="@string/faq">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="http://acrdevelopment.org/lightning/faq">
-            <extra
-                android:name="SOURCE"
-                android:value="SELF"/>
-        </intent>
-    </header>
     <header
         android:fragment="org.purplei2p.lightning.settings.fragment.DebugSettingsFragment"
         android:title="@string/debug_title"/>