Changes between Version 2 and Version 3 of Ticket #2523, comment 1


Ignore:
Timestamp:
Jun 18, 2019 2:05:38 AM (2 years ago)
Author:
idk
Comment:

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #2523, comment 1

    v2 v3  
    77The following diff updates all the recommendations except for Lightning. It also fixes 2521.
    88
    9 {{{
     9{{{#
     10# old_revision [d418dc7f5b0e9ceb0c6a34de97672b46a3b78c28]
    1011#
    11 # old_revision [fb8a597576a48c4c3c2cbc42d0b70871084cc2e7]
    12 #
     12# add_file "app/src/main/res/raw/help_org_gnu_icecat.html"
     13#  content [a99e48492f678d257dad43a3239553ce64944264]
     14#
     15# add_file "app/src/main/res/raw/help_org_mozilla_fennec_fdroid.html"
     16#  content [bec93f4ba58b8f201e01c8f3b94f1810e7e28f73]
     17#
    1318# patch "app/src/main/res/raw/help_i2ptunnel.html"
    1419#  from [4af9112c8344f2db8388a9c6c16efff97ff32db6]
    … …  
    2732#    to [39c4a4f333cd23a5cfd492f33e404a888786c65b]
    2833#
    29 # patch "app/src/main/res/raw/help_org_gnu_icecat.html"
    30 #  from [733ddef0a294da3d8138b3b720b4dee5e41964bb]
    31 #    to [a99e48492f678d257dad43a3239553ce64944264]
    32 #
    33 # patch "app/src/main/res/raw/help_org_mozilla_fennec_fdroid.html"
    34 #  from [28fe46948b05d0256facea5c9319a08e22319ab5]
    35 #    to [bec93f4ba58b8f201e01c8f3b94f1810e7e28f73]
    36 #
    3734# patch "app/src/main/res/raw/help_org_mozilla_firefox.html"
    3835#  from [9cc592624443d6dccb51cec123d452920c68d261]
    … …  
    4441#
    4542# patch "app/src/main/res/values/arrays.xml"
    46 #  from [c83f491f07677ca827f4331917a78759e2f07a1b]
     43#  from [5246c61193b367dc6791acea3fdb8ea6bce9dbde]
    4744#    to [9dec9dea58bd45458e09f61323372bc6bb07512f]
    4845#
    … …  
    126123+</html>
    127124============================================================
    128 --- app/src/main/res/raw/help_org_gnu_icecat.html       733ddef0a294da3d8138b3b720b4dee5e41964bb
     125--- /dev/null   
    129126+++ app/src/main/res/raw/help_org_gnu_icecat.html       a99e48492f678d257dad43a3239553ce64944264
    130 @@ -3,13 +3,33 @@
    131  <body>
    132  <h2>How to configure GNU IceCat:</h2>
    133  <ol>
    134 -    <li>Click <a href="about:config?filter=network.proxy">HERE</a>, and choose to open the URL in Firefox.</li>
     127@@ -0,0 +1,35 @@
     128+<html>
     129+<head></head>
     130+<body>
     131+<h2>How to configure GNU IceCat:</h2>
     132+<ol>
    135133+    <li>Click <a href="about:config?filter=network.proxy">HERE</a>, and choose to open the URL in IceCatMobile.</li>
    136      <li>Change the value of "network.proxy.type" to <code>1</code>.</li>
    137      <li>Change the value of "network.proxy.http" to <code>127.0.0.1</code>.</li>
    138      <li>Change the value of "network.proxy.http_port" to <code>4444</code>.</li>
    139      <li>Change the value of "network.proxy.ssl" to <code>127.0.0.1</code>.</li>
    140      <li>Change the value of "network.proxy.ssl_port" to <code>4444</code>.</li>
     134+    <li>Change the value of "network.proxy.type" to <code>1</code>.</li>
     135+    <li>Change the value of "network.proxy.http" to <code>127.0.0.1</code>.</li>
     136+    <li>Change the value of "network.proxy.http_port" to <code>4444</code>.</li>
     137+    <li>Change the value of "network.proxy.ssl" to <code>127.0.0.1</code>.</li>
     138+    <li>Change the value of "network.proxy.ssl_port" to <code>4444</code>.</li>
    141139+    <li>Change the value of "media.peerconnection.ice.proxy_only" to <code>true</code><li>
    142140+    <li>You may also wish to install plugins to help manage your browser's
    … …  
    144142+    Private Browsing to manage your browser's cache.
    145143+    </li>
    146      <li>You can now browse I2P eepsites!</li>
    147  </ol>
     144+    <li>You can now browse I2P eepsites!</li>
     145+</ol>
    148146+<h3>Alternate Configuration(Requires Root!)</h3>
    149147+<ol>
    … …  
    161159+    <li>You can now browse I2P eepsites!</li>
    162160+</ol>
    163  </body>
    164  </html>
    165 ============================================================
    166 --- app/src/main/res/raw/help_org_mozilla_fennec_fdroid.html    28fe46948b05d0256facea5c9319a08e22319ab5
     161+</body>
     162+</html>
     163============================================================
     164--- /dev/null   
    167165+++ app/src/main/res/raw/help_org_mozilla_fennec_fdroid.html    bec93f4ba58b8f201e01c8f3b94f1810e7e28f73
    168 @@ -3,13 +3,33 @@
    169  <body>
    170  <h2>How to configure Fennec Firefox:</h2>
    171  <ol>
    172 -    <li>Click <a href="about:config?filter=network.proxy">HERE</a>, and choose to open the URL in Firefox.</li>
     166@@ -0,0 +1,35 @@
     167+<html>
     168+<head></head>
     169+<body>
     170+<h2>How to configure Fennec Firefox:</h2>
     171+<ol>
    173172+    <li>Click <a href="about:config?filter=proxy">HERE</a>, and choose to open the URL in Fennec.</li>
    174      <li>Change the value of "network.proxy.type" to <code>1</code>.</li>
    175      <li>Change the value of "network.proxy.http" to <code>127.0.0.1</code>.</li>
    176      <li>Change the value of "network.proxy.http_port" to <code>4444</code>.</li>
    177      <li>Change the value of "network.proxy.ssl" to <code>127.0.0.1</code>.</li>
    178      <li>Change the value of "network.proxy.ssl_port" to <code>4444</code>.</li>
     173+    <li>Change the value of "network.proxy.type" to <code>1</code>.</li>
     174+    <li>Change the value of "network.proxy.http" to <code>127.0.0.1</code>.</li>
     175+    <li>Change the value of "network.proxy.http_port" to <code>4444</code>.</li>
     176+    <li>Change the value of "network.proxy.ssl" to <code>127.0.0.1</code>.</li>
     177+    <li>Change the value of "network.proxy.ssl_port" to <code>4444</code>.</li>
    179178+    <li>Change the value of "media.peerconnection.ice.proxy_only" to <code>true</code><li>
    180179+    <li>You may also wish to install plugins to help manage your browser's
    … …  
    182181+    Private Browsing to manage your browser's cache.
    183182+    </li>
    184      <li>You can now browse I2P eepsites!</li>
    185  </ol>
     183+    <li>You can now browse I2P eepsites!</li>
     184+</ol>
    186185+<h3>Alternate Configuration(Requires Root!)</h3>
    187186+<ol>
    … …  
    199198+    <li>You can now browse I2P eepsites!</li>
    200199+</ol>
    201  </body>
    202  </html>
     200+</body>
     201+</html>
    203202============================================================
    204203--- app/src/main/res/raw/help_org_mozilla_firefox.html  9cc592624443d6dccb51cec123d452920c68d261
    … …  
    253252+</html>
    254253============================================================
    255 --- app/src/main/res/values/arrays.xml  c83f491f07677ca827f4331917a78759e2f07a1b
     254--- app/src/main/res/values/arrays.xml  5246c61193b367dc6791acea3fdb8ea6bce9dbde
    256255+++ app/src/main/res/values/arrays.xml  9dec9dea58bd45458e09f61323372bc6bb07512f
    257 @@ -125,13 +125,16 @@
     256@@ -114,20 +114,29 @@
     257         <item>Lightning</item>
     258     </string-array>
     259     <string-array name="supported_browsers">
     260-        <item>info.guardianproject.browser</item>
     261         <item>org.mozilla.firefox</item>
     262+        <item>org.mozilla.fennec_fdroid</item>
     263+        <item>org.gnu.icecat</item>
     264     </string-array>
     265     <string-array name="supported_browser_labels">
     266-        <item>Orweb</item>
     267         <item>Firefox</item>
     268+        <item>Fennec F-Droid</item>
     269+        <item>IceCatMobile</item>
    258270     </string-array>
    259271     <string-array name="unsupported_browsers">
    … …  
    267279         <item>com.lastpass.lpandroid</item>
    268280         <item>org.mozilla.focus</item>
    269 -        <item>org.brave.browser</item>
    270 -        <item>com.stoutner.privacybrowser.standard</item>
    271281+        <item>org.mozilla.rocket</item>
    272282+        <item>org.mozilla.klar</item>
    273          <item>org.torproject.torbrowser</item>
    274          <item>org.torproject.torbrowser_alpha</item>
    275      </string-array>
     283+        <item>org.torproject.torbrowser</item>
     284+        <item>org.torproject.torbrowser_alpha</item>
     285     </string-array>
     286     <string-array name="tunnel_profiles">
     287         <item>bulk</item>
    276288}}}