From 50cc3d99e4cbaa8052d4ff9a074ddf94205bc838 Mon Sep 17 00:00:00 2001
From: T0astBread <tb@t0ast.cc>
Date: Fri, 6 Nov 2020 19:06:03 +0100
Subject: [PATCH 1/2] Suffix debug build IDs and version numbers

to allow for parallel installation of debug and production builds
---
 app/build.gradle                 |  2 ++
 app/src/main/AndroidManifest.xml | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4c091e12e..72fe3b5bf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,6 +24,8 @@ android {
 
     buildTypes {
         debug {
+            applicationIdSuffix ".debug"
+            versionNameSuffix "-debug"
             minifyEnabled !rootProject.ext.ci
             useProguard false
         }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3fa857c33..4d8a6aecb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,12 +27,12 @@
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.VIBRATE" />
 
-    <permission android:name="io.github.hidroh.materialistic.permission.SYNC_ITEM"
+    <permission android:name="${applicationId}.permission.SYNC_ITEM"
         android:protectionLevel="signature" />
-    <permission android:name="io.github.hidroh.materialistic.permission.AUTHENTICATE_ACCOUNTS"
+    <permission android:name="${applicationId}.permission.AUTHENTICATE_ACCOUNTS"
         android:protectionLevel="signature" />
-    <uses-permission android:name="io.github.hidroh.materialistic.permission.SYNC_ITEM" />
-    <uses-permission android:name="io.github.hidroh.materialistic.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="${applicationId}.permission.SYNC_ITEM" />
+    <uses-permission android:name="${applicationId}.permission.AUTHENTICATE_ACCOUNTS" />
 
     <uses-sdk tools:overrideLibrary="androidx.browser" />
 
@@ -271,15 +271,15 @@
             android:name=".data.WebCacheService"
             android:exported="false" />
         <provider
-            android:authorities="io.github.hidroh.materialistic.syncprovider"
+            android:authorities="${applicationId}.syncprovider"
             android:name=".data.SyncContentProvider"
             android:exported="false" />
         <provider
-            android:authorities="io.github.hidroh.materialistic.recentprovider"
+            android:authorities="${applicationId}.recentprovider"
             android:name=".data.SearchRecentSuggestionsProvider"
             android:exported="false" />
         <provider
-            android:authorities="io.github.hidroh.materialistic.fileprovider"
+            android:authorities="${applicationId}.fileprovider"
             android:name="androidx.core.content.FileProvider"
             android:exported="false"
             android:grantUriPermissions="true">

From 1c1eaeb91e2a16aefcea85429263df2540a1083b Mon Sep 17 00:00:00 2001
From: T0astBread <tb@t0ast.cc>
Date: Fri, 6 Nov 2020 19:13:45 +0100
Subject: [PATCH 2/2] Add proxy support

This commit adds support for proxying network requests over a SOCKS
or HTTP proxy and the corresponding preferences screen.

A DelegatingProxy (which is a java.net.Proxy) is registered on every
RestService. The DelegatingProxy delegates its proxying to a real
Proxy created from the proxy preferences.

This implementation is a bit ugly but the fact that RestServices are
only created once while proxy preferences can change at any time made
it hard to avoid global state and the DelegatingProxy class.

Enabling proxying breaks search.
---
 .../hidroh/materialistic/DelegatingProxy.kt   | 19 +++++++
 .../hidroh/materialistic/Preferences.java     | 27 ++++++++++
 .../materialistic/PreferencesActivity.java    |  6 +++
 .../materialistic/SettingsActivity.java       |  4 ++
 .../hidroh/materialistic/ThemedActivity.java  |  5 ++
 .../data/RestServiceFactory.java              |  7 ++-
 .../res/drawable/ic_baseline_language_24.xml  |  9 ++++
 app/src/main/res/layout/activity_settings.xml | 11 ++++
 app/src/main/res/values/arrays.xml            | 12 +++++
 app/src/main/res/values/ids.xml               |  1 +
 app/src/main/res/values/non_translatable.xml  |  2 +
 app/src/main/res/values/preference_keys.xml   |  5 ++
 app/src/main/res/values/strings.xml           |  9 ++++
 app/src/main/res/xml/preferences_proxy.xml    | 51 +++++++++++++++++++
 14 files changed, 167 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/io/github/hidroh/materialistic/DelegatingProxy.kt
 create mode 100644 app/src/main/res/drawable/ic_baseline_language_24.xml
 create mode 100644 app/src/main/res/xml/preferences_proxy.xml

diff --git a/app/src/main/java/io/github/hidroh/materialistic/DelegatingProxy.kt b/app/src/main/java/io/github/hidroh/materialistic/DelegatingProxy.kt
new file mode 100644
index 000000000..84220af20
--- /dev/null
+++ b/app/src/main/java/io/github/hidroh/materialistic/DelegatingProxy.kt
@@ -0,0 +1,19 @@
+package io.github.hidroh.materialistic
+
+import android.content.Context
+import java.net.InetSocketAddress
+import java.net.Proxy
+
+class DelegatingProxy : Proxy(Type.SOCKS, InetSocketAddress.createUnresolved("127.0.0.1", 1)) {
+    override fun type() = activeProxy.type()
+    override fun address() = activeProxy.address()
+
+    companion object {
+        var activeProxy: Proxy = NO_PROXY
+
+        @JvmStatic
+        fun updateFromPreferences(context: Context) {
+            activeProxy = Preferences.getProxy(context)
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/hidroh/materialistic/Preferences.java b/app/src/main/java/io/github/hidroh/materialistic/Preferences.java
index 666e32d98..80ef1349d 100644
--- a/app/src/main/java/io/github/hidroh/materialistic/Preferences.java
+++ b/app/src/main/java/io/github/hidroh/materialistic/Preferences.java
@@ -23,6 +23,7 @@
 import android.content.pm.PackageManager;
 import android.text.TextUtils;
 
+import java.net.*;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Locale;
@@ -304,6 +305,21 @@ public static SwipeAction[] getListSwipePreferences(Context context) {
         return new SwipeAction[]{parseSwipeAction(left), parseSwipeAction(right)};
     }
 
+    public static Proxy getProxy(Context context) {
+        boolean isEnabled = get(context, R.string.pref_proxy_enabled, false);
+        if (!isEnabled)
+            return Proxy.NO_PROXY;
+        Proxy.Type type = getProxyType(context);
+        String host = get(context, R.string.pref_proxy_host, R.string.pref_proxy_host_default);
+        int port = Integer.parseInt(get(context, R.string.pref_proxy_port, R.string.pref_proxy_port_default));
+        try {
+            return new Proxy(type, new InetSocketAddress(InetAddress.getByName(host), port));
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+            return Proxy.NO_PROXY;
+        }
+    }
+
     public static void reset(Context context) {
         PreferenceManager.getDefaultSharedPreferences(context)
                 .edit()
@@ -311,6 +327,17 @@ public static void reset(Context context) {
                 .apply();
     }
 
+    private static Proxy.Type getProxyType(Context context) {
+        String protocolStr = get(context, R.string.pref_proxy_protocol, R.string.pref_proxy_protocol_socks);
+        if (context.getResources().getString(R.string.pref_proxy_protocol_value_socks).equals(protocolStr)) {
+            return Proxy.Type.SOCKS;
+        } else if (context.getResources().getString(R.string.pref_proxy_protocol_value_http).equals(protocolStr)) {
+            return Proxy.Type.HTTP;
+        } else {
+            throw new IllegalArgumentException("Invalid proxy protocol: " + protocolStr);
+        }
+    }
+
     private static SwipeAction parseSwipeAction(String value) {
         try {
             return SwipeAction.valueOf(value);
diff --git a/app/src/main/java/io/github/hidroh/materialistic/PreferencesActivity.java b/app/src/main/java/io/github/hidroh/materialistic/PreferencesActivity.java
index 058cc8370..898e4844e 100644
--- a/app/src/main/java/io/github/hidroh/materialistic/PreferencesActivity.java
+++ b/app/src/main/java/io/github/hidroh/materialistic/PreferencesActivity.java
@@ -48,6 +48,12 @@ protected void onCreate(Bundle savedInstanceState) {
         }
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        DelegatingProxy.updateFromPreferences(this);
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
diff --git a/app/src/main/java/io/github/hidroh/materialistic/SettingsActivity.java b/app/src/main/java/io/github/hidroh/materialistic/SettingsActivity.java
index aa814f859..e7e00879b 100644
--- a/app/src/main/java/io/github/hidroh/materialistic/SettingsActivity.java
+++ b/app/src/main/java/io/github/hidroh/materialistic/SettingsActivity.java
@@ -59,6 +59,10 @@ protected void onCreate(Bundle savedInstanceState) {
                 startActivity(new Intent(SettingsActivity.this, PreferencesActivity.class)
                         .putExtra(PreferencesActivity.EXTRA_TITLE, R.string.readability)
                         .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_readability)));
+        findViewById(R.id.menu_proxy).setOnClickListener(v ->
+                startActivity(new Intent(SettingsActivity.this, PreferencesActivity.class)
+                        .putExtra(PreferencesActivity.EXTRA_TITLE, R.string.proxy)
+                        .putExtra(PreferencesActivity.EXTRA_PREFERENCES, R.xml.preferences_proxy)));
         findViewById(R.id.drawer_about).setOnClickListener(v ->
                 startActivity(new Intent(SettingsActivity.this, AboutActivity.class)));
         findViewById(R.id.drawer_release).setOnClickListener(v ->
diff --git a/app/src/main/java/io/github/hidroh/materialistic/ThemedActivity.java b/app/src/main/java/io/github/hidroh/materialistic/ThemedActivity.java
index d70ae2bc7..e2d70c071 100644
--- a/app/src/main/java/io/github/hidroh/materialistic/ThemedActivity.java
+++ b/app/src/main/java/io/github/hidroh/materialistic/ThemedActivity.java
@@ -40,6 +40,11 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setTaskTitle(getTitle());
         mMenuTintDelegate.onActivityCreated(this);
+
+        // Maybe not the right place to do this but this needs to run
+        // after the app starts and ThemedActivity is a common base
+        // class for activities
+        DelegatingProxy.updateFromPreferences(this);
     }
 
     @Override
diff --git a/app/src/main/java/io/github/hidroh/materialistic/data/RestServiceFactory.java b/app/src/main/java/io/github/hidroh/materialistic/data/RestServiceFactory.java
index 3f8340ad0..6d2c97171 100644
--- a/app/src/main/java/io/github/hidroh/materialistic/data/RestServiceFactory.java
+++ b/app/src/main/java/io/github/hidroh/materialistic/data/RestServiceFactory.java
@@ -24,7 +24,8 @@
 
 import javax.inject.Inject;
 
-import okhttp3.Call;
+import io.github.hidroh.materialistic.*;
+import okhttp3.*;
 import retrofit2.Retrofit;
 import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
@@ -72,6 +73,10 @@ public <T> T create(String baseUrl, Class<T> clazz, Executor callbackExecutor) {
             builder.callFactory(mCallFactory)
                     .callbackExecutor(callbackExecutor != null ?
                             callbackExecutor : new MainThreadExecutor());
+            OkHttpClient httpClient = new OkHttpClient.Builder()
+                    .proxy(new DelegatingProxy())
+                    .build();
+            builder.client(httpClient);
             return builder.baseUrl(baseUrl)
                     .addConverterFactory(GsonConverterFactory.create())
                     .build()
diff --git a/app/src/main/res/drawable/ic_baseline_language_24.xml b/app/src/main/res/drawable/ic_baseline_language_24.xml
new file mode 100644
index 000000000..c70400f8e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_language_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 3239813ea..d9f873420 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -90,6 +90,17 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/divider" />
 
+            <io.github.hidroh.materialistic.widget.TintableTextView
+                android:id="@id/menu_proxy"
+                android:text="@string/title_activity_proxy"
+                app:iconStart="@drawable/ic_baseline_language_24"
+                style="@style/DrawerTextStyle"/>
+
+            <View
+                android:background="@color/blackT12"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/divider" />
+
             <io.github.hidroh.materialistic.widget.TintableTextView
                 android:id="@id/drawer_about"
                 android:text="@string/title_activity_about"
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index d4e11607b..97a8cdd75 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -78,6 +78,18 @@
     <string name="pref_story_display_value_article" translatable="false">article</string>
     <string name="pref_story_display_value_readability" translatable="false">readability</string>
 
+    <!-- Proxy -->
+    <string-array name="pref_proxy_protocol_options">
+        <item>@string/pref_proxy_protocol_socks</item>
+        <item>@string/pref_proxy_protocol_http</item>
+    </string-array>
+    <string-array name="pref_proxy_protocol_values">
+        <item>@string/pref_proxy_protocol_value_socks</item>
+        <item>@string/pref_proxy_protocol_value_http</item>
+    </string-array>
+    <string name="pref_proxy_protocol_value_socks" translatable="false">socks</string>
+    <string name="pref_proxy_protocol_value_http" translatable="false">http</string>
+
     <!-- Comment max lines -->
     <string-array name="comment_max_lines_options">
         <item>@string/comment_max_lines_3</item>
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index 75d0cc82e..cab92b814 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -63,6 +63,7 @@
     <item type="id" name="drawer_display" />
     <item type="id" name="drawer_offline" />
     <item type="id" name="drawer_more" />
+    <item type="id" name="menu_proxy" />
 
     <!-- menu -->
     <item type="id" name="menu_share" />
diff --git a/app/src/main/res/values/non_translatable.xml b/app/src/main/res/values/non_translatable.xml
index d1eed3ad7..8512b766f 100644
--- a/app/src/main/res/values/non_translatable.xml
+++ b/app/src/main/res/values/non_translatable.xml
@@ -95,5 +95,7 @@
         ]]>
     </string>
     <string name="fab_scrolling_view_behavior" translatable="false">io.github.hidroh.materialistic.FabAwareScrollBehavior</string>
+    <string name="pref_proxy_host_default" translatable="false">127.0.0.1</string>
+    <string name="pref_proxy_port_default" translatable="false">9050</string>
 
 </resources>
diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml
index 62db43f68..82a6e1d69 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -66,4 +66,9 @@
     <string translatable="false" name="pref_username">pref_username</string>
     <string translatable="false" name="pref_volume">pref_volume</string>
     <string translatable="false" name="pref_volume_help">pref_volume_help</string>
+    <string translatable="false" name="pref_proxy">pref_proxy</string>
+    <string translatable="false" name="pref_proxy_enabled">pref_proxy_enabled</string>
+    <string translatable="false" name="pref_proxy_protocol">pref_proxy_protocol</string>
+    <string translatable="false" name="pref_proxy_host">pref_proxy_host</string>
+    <string translatable="false" name="pref_proxy_port">pref_proxy_port</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 33b07e4c5..c3b790372 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -23,6 +23,7 @@
     <string name="title_activity_best">Best Stories</string>
     <string name="title_activity_item">Comments</string>
     <string name="title_activity_release">What\'s New</string>
+    <string name="title_activity_proxy">Proxy</string>
     <string name="filter_title_item">Materialistic</string>
     <string name="open_drawer">Open drawer</string>
     <string name="close_drawer">Close drawer</string>
@@ -110,6 +111,13 @@
     <string name="pref_smooth_scroll_summary">Disable to improve scroll accuracy</string>
     <string name="pref_list_swipe_left_title">Swipe left to</string>
     <string name="pref_list_swipe_right_title">Swipe right to</string>
+    <string name="pref_proxy_enabled_title">Use proxy</string>
+    <string name="pref_proxy_enabled_summary">Use a proxy server for all network requests not made via an external browser</string>
+    <string name="pref_proxy_protocol_title">Proxy protocol</string>
+    <string name="pref_proxy_protocol_socks">SOCKS</string>
+    <string name="pref_proxy_protocol_http">HTTP</string>
+    <string name="pref_proxy_host_title">Proxy server host</string>
+    <string name="pref_proxy_port_title">Proxy server port</string>
 
     <string name="connection_error">Unable to connect to Hacker News. Check your connection or try again.</string>
     <string name="select_story">Select a story to view</string>
@@ -321,5 +329,6 @@
     <string name="share_file">Share file</string>
     <string name="privacy_policy">Privacy Policy</string>
     <string name="notification_channel_downloads">Downloads</string>
+    <string name="proxy">Proxy</string>
 
 </resources>
diff --git a/app/src/main/res/xml/preferences_proxy.xml b/app/src/main/res/xml/preferences_proxy.xml
new file mode 100644
index 000000000..20bd927ae
--- /dev/null
+++ b/app/src/main/res/xml/preferences_proxy.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2020 Ha Duy Trung
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<androidx.preference.PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.preference.SwitchPreferenceCompat
+        app:iconSpaceReserved="false"
+        android:key="@string/pref_proxy_enabled"
+        android:title="@string/pref_proxy_enabled_title"
+        android:summary="@string/pref_proxy_enabled_summary"
+        android:defaultValue="false"/>
+
+    <io.github.hidroh.materialistic.preference.SimpleSpinnerPreference
+        android:key="@string/pref_proxy_protocol"
+        android:dependency="@string/pref_proxy_enabled"
+        android:title="@string/pref_proxy_protocol_title"
+        app:entries="@array/pref_proxy_protocol_options"
+        app:entryValues="@array/pref_proxy_protocol_values"
+        android:defaultValue="@string/pref_proxy_protocol_value_socks"/>
+
+    <EditTextPreference
+        android:key="@string/pref_proxy_host"
+        android:dependency="@string/pref_proxy_enabled"
+        android:title="@string/pref_proxy_host_title"
+        android:defaultValue="@string/pref_proxy_host_default"
+        app:iconSpaceReserved="false"/>
+
+    <EditTextPreference
+        android:key="@string/pref_proxy_port"
+        android:dependency="@string/pref_proxy_enabled"
+        android:title="@string/pref_proxy_port_title"
+        android:defaultValue="@string/pref_proxy_port_default"
+        app:iconSpaceReserved="false"/>
+
+</androidx.preference.PreferenceScreen>