Merge branch 'KOSBUM-http_proxy_settings' into dev

multisite
Floens 10 years ago
commit 0e98dd0f4b
  1. 4
      Clover/app/src/main/java/org/floens/chan/Chan.java
  2. 17
      Clover/app/src/main/java/org/floens/chan/chan/ChanHelper.java
  3. 3
      Clover/app/src/main/java/org/floens/chan/core/cache/FileCache.java
  4. 17
      Clover/app/src/main/java/org/floens/chan/core/http/PassHttpCall.java
  5. 44
      Clover/app/src/main/java/org/floens/chan/core/net/ProxiedHurlStack.java
  6. 2
      Clover/app/src/main/java/org/floens/chan/core/presenter/ReplyPresenter.java
  7. 45
      Clover/app/src/main/java/org/floens/chan/core/settings/ChanSettings.java
  8. 56
      Clover/app/src/main/java/org/floens/chan/core/settings/IntegerSetting.java
  9. 2
      Clover/app/src/main/java/org/floens/chan/core/watch/PinWatcher.java
  10. 4
      Clover/app/src/main/java/org/floens/chan/test/TestActivity.java
  11. 8
      Clover/app/src/main/java/org/floens/chan/ui/controller/AdvancedSettingsController.java
  12. 2
      Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java
  13. 2
      Clover/app/src/main/java/org/floens/chan/ui/controller/ViewThreadController.java
  14. 17
      Clover/app/src/main/java/org/floens/chan/ui/helper/RefreshUIMessage.java
  15. 2
      Clover/app/src/main/java/org/floens/chan/ui/layout/ReplyLayout.java
  16. 91
      Clover/app/src/main/java/org/floens/chan/ui/settings/IntegerSettingView.java
  17. 10
      Clover/app/src/main/java/org/floens/chan/ui/settings/SettingsController.java
  18. 17
      Clover/app/src/main/java/org/floens/chan/ui/state/ChanState.java
  19. 17
      Clover/app/src/main/java/org/floens/chan/ui/theme/DarkTheme.java
  20. 5
      Clover/app/src/main/res/values/strings.xml

@ -35,6 +35,7 @@ import org.floens.chan.core.http.ReplyManager;
import org.floens.chan.core.manager.BoardManager;
import org.floens.chan.core.manager.WatchManager;
import org.floens.chan.core.net.BitmapLruImageCache;
import org.floens.chan.core.net.ProxiedHurlStack;
import org.floens.chan.core.settings.ChanSettings;
import org.floens.chan.utils.AndroidUtils;
import org.floens.chan.utils.Logger;
@ -150,7 +151,8 @@ public class Chan extends Application {
replyManager = new ReplyManager(this);
volleyRequestQueue = Volley.newRequestQueue(this, getUserAgent(), null, new File(cacheDir, Volley.DEFAULT_CACHE_DIR), VOLLEY_CACHE_SIZE);
String userAgent = getUserAgent();
volleyRequestQueue = Volley.newRequestQueue(this, userAgent, new ProxiedHurlStack(userAgent), new File(cacheDir, Volley.DEFAULT_CACHE_DIR), VOLLEY_CACHE_SIZE);
final int runtimeMemory = (int) (Runtime.getRuntime().maxMemory() / 1024);
final int lruImageCacheSize = runtimeMemory / 8;

@ -1,3 +1,20 @@
/*
* Clover - 4chan browser https://github.com/Floens/Clover/
* Copyright (C) 2014 Floens
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.floens.chan.chan;
import android.net.Uri;

@ -25,6 +25,7 @@ import com.squareup.okhttp.Response;
import com.squareup.okhttp.ResponseBody;
import com.squareup.okhttp.internal.Util;
import org.floens.chan.core.settings.ChanSettings;
import org.floens.chan.utils.AndroidUtils;
import org.floens.chan.utils.Logger;
import org.floens.chan.utils.Time;
@ -419,6 +420,8 @@ public class FileCache {
.header("User-Agent", userAgent)
.build();
fileCache.httpClient.setProxy(ChanSettings.getProxy());
call = fileCache.httpClient.newCall(request);
Response response = call.execute();
if (!response.isSuccessful()) {

@ -1,3 +1,20 @@
/*
* Clover - 4chan browser https://github.com/Floens/Clover/
* Copyright (C) 2014 Floens
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.floens.chan.core.http;
import com.squareup.okhttp.FormEncodingBuilder;

@ -0,0 +1,44 @@
/*
* Clover - 4chan browser https://github.com/Floens/Clover/
* Copyright (C) 2014 Floens
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.floens.chan.core.net;
import com.android.volley.toolbox.HurlStack;
import org.floens.chan.core.settings.ChanSettings;
import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.Proxy;
import java.net.URL;
public class ProxiedHurlStack extends HurlStack {
public ProxiedHurlStack(String userAgent) {
super(userAgent, null);
}
@Override
protected HttpURLConnection createConnection(URL url) throws IOException {
// Start the connection by specifying a proxy server
Proxy proxy = ChanSettings.getProxy();
if (proxy != null) {
return (HttpURLConnection) url.openConnection(proxy);
} else {
return (HttpURLConnection) url.openConnection();
}
}
}

@ -22,6 +22,7 @@ import android.text.TextUtils;
import org.floens.chan.Chan;
import org.floens.chan.R;
import org.floens.chan.chan.ChanUrls;
import org.floens.chan.core.database.DatabaseManager;
import org.floens.chan.core.http.ReplyHttpCall;
import org.floens.chan.core.http.ReplyManager;
import org.floens.chan.core.manager.BoardManager;
@ -32,7 +33,6 @@ import org.floens.chan.core.model.Post;
import org.floens.chan.core.model.Reply;
import org.floens.chan.core.model.SavedReply;
import org.floens.chan.core.settings.ChanSettings;
import org.floens.chan.core.database.DatabaseManager;
import org.floens.chan.ui.helper.ImagePickDelegate;
import org.floens.chan.ui.layout.CaptchaLayout;

@ -28,6 +28,8 @@ import org.floens.chan.ui.cell.PostCellInterface;
import org.floens.chan.utils.AndroidUtils;
import java.io.File;
import java.net.InetSocketAddress;
import java.net.Proxy;
public class ChanSettings {
public enum ImageAutoLoadMode {
@ -54,6 +56,8 @@ public class ChanSettings {
}
}
private static Proxy proxy;
private static final StringSetting theme;
public static final StringSetting fontSize;
public static final BooleanSetting openLinkConfirmation;
@ -97,6 +101,10 @@ public class ChanSettings {
public static final BooleanSetting historyEnabled;
public static final BooleanSetting proxyEnabled;
public static final StringSetting proxyAddress;
public static final IntegerSetting proxyPort;
static {
SharedPreferences p = AndroidUtils.getPreferences();
@ -161,6 +169,26 @@ public class ChanSettings {
historyEnabled = new BooleanSetting(p, "preference_history_enabled", true);
proxyEnabled = new BooleanSetting(p, "preference_proxy_enabled", false, new Setting.SettingCallback<Boolean>() {
@Override
public void onValueChange(Setting setting, Boolean value) {
loadProxy();
}
});
proxyAddress = new StringSetting(p, "preference_proxy_address", "", new Setting.SettingCallback<String>() {
@Override
public void onValueChange(Setting setting, String value) {
loadProxy();
}
});
proxyPort = new IntegerSetting(p, "preference_proxy_port", 80, new Setting.SettingCallback<Integer>() {
@Override
public void onValueChange(Setting setting, Integer value) {
loadProxy();
}
});
loadProxy();
// Old (but possibly still in some users phone)
// preference_board_view_mode default "list"
// preference_board_editor_filler default false
@ -194,6 +222,23 @@ public class ChanSettings {
}
}
/**
* Returns a {@link Proxy} if a proxy is enabled, <tt>null</tt> otherwise.
*
* @return a proxy or null
*/
public static Proxy getProxy() {
return proxy;
}
private static void loadProxy() {
if (proxyEnabled.get()) {
proxy = new Proxy(Proxy.Type.HTTP, InetSocketAddress.createUnresolved(proxyAddress.get(), proxyPort.get()));
} else {
proxy = null;
}
}
public static class ThemeColor {
public String theme;
public String color;

@ -0,0 +1,56 @@
/*
* Clover - 4chan browser https://github.com/Floens/Clover/
* Copyright (C) 2014 Floens
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.floens.chan.core.settings;
import android.content.SharedPreferences;
/**
* Created by Zetsubou on 02.07.2015
*/
public class IntegerSetting extends Setting<Integer> {
private boolean hasCached = false;
private Integer cached;
public IntegerSetting(SharedPreferences sharedPreferences, String key, Integer def) {
super(sharedPreferences, key, def);
}
public IntegerSetting(SharedPreferences sharedPreferences, String key, Integer def, SettingCallback<Integer> callback) {
super(sharedPreferences, key, def, callback);
}
@Override
public Integer get() {
if (hasCached) {
return cached;
} else {
cached = sharedPreferences.getInt(key, def);
hasCached = true;
return cached;
}
}
@Override
public void set(Integer value) {
if (!value.equals(get())) {
sharedPreferences.edit().putInt(key, value).apply();
cached = value;
onValueChanged();
}
}
}

@ -21,10 +21,10 @@ import com.android.volley.VolleyError;
import org.floens.chan.Chan;
import org.floens.chan.chan.ChanLoader;
import org.floens.chan.core.net.LoaderPool;
import org.floens.chan.core.model.ChanThread;
import org.floens.chan.core.model.Pin;
import org.floens.chan.core.model.Post;
import org.floens.chan.core.net.LoaderPool;
import org.floens.chan.utils.AndroidUtils;
import org.floens.chan.utils.Logger;

@ -28,13 +28,13 @@ import android.widget.LinearLayout;
import com.android.volley.VolleyError;
import org.floens.chan.Chan;
import org.floens.chan.core.cache.FileCache;
import org.floens.chan.chan.ChanLoader;
import org.floens.chan.core.cache.FileCache;
import org.floens.chan.core.model.ChanThread;
import org.floens.chan.core.model.Loadable;
import org.floens.chan.core.model.Post;
import org.floens.chan.utils.Logger;
import org.floens.chan.ui.theme.ThemeHelper;
import org.floens.chan.utils.Logger;
import java.io.File;

@ -27,9 +27,11 @@ import org.floens.chan.R;
import org.floens.chan.core.settings.ChanSettings;
import org.floens.chan.ui.fragment.FolderPickFragment;
import org.floens.chan.ui.settings.BooleanSettingView;
import org.floens.chan.ui.settings.IntegerSettingView;
import org.floens.chan.ui.settings.LinkSettingView;
import org.floens.chan.ui.settings.SettingsController;
import org.floens.chan.ui.settings.SettingsGroup;
import org.floens.chan.ui.settings.StringSettingView;
import java.io.File;
@ -92,6 +94,12 @@ public class AdvancedSettingsController extends SettingsController {
settings.add(new BooleanSettingView(this, ChanSettings.tapNoReply, string(R.string.setting_tap_no_rely), null));
groups.add(settings);
SettingsGroup proxy = new SettingsGroup(string(R.string.settings_group_proxy));
proxy.add(new BooleanSettingView(this, ChanSettings.proxyEnabled, string(R.string.setting_proxy_enabled), null));
proxy.add(new StringSettingView(this, ChanSettings.proxyAddress, string(R.string.setting_proxy_address), string(R.string.setting_proxy_address)));
proxy.add(new IntegerSettingView(this, ChanSettings.proxyPort, string(R.string.setting_proxy_port), string(R.string.setting_proxy_port)));
groups.add(proxy);
}
private void setSaveLocationDescription() {

@ -172,7 +172,7 @@ public class MainSettingsController extends SettingsController implements Toolba
List<ListSettingView.Item> imageAutoLoadTypes = new ArrayList<>();
for (ChanSettings.ImageAutoLoadMode mode : ChanSettings.ImageAutoLoadMode.values()) {
String name = "";
switch(mode) {
switch (mode) {
case ALL:
name = string(R.string.setting_image_auto_load_all);
break;

@ -177,7 +177,7 @@ public class ViewThreadController extends ThreadController implements ThreadLayo
break;
case UP_ID:
case DOWN_ID:
boolean up = ((Integer)item.getId()) == UP_ID;
boolean up = ((Integer) item.getId()) == UP_ID;
threadLayout.getPresenter().scrollTo(up ? 0 : -1, false);
break;
}

@ -1,3 +1,20 @@
/*
* Clover - 4chan browser https://github.com/Floens/Clover/
* Copyright (C) 2014 Floens
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.floens.chan.ui.helper;
public class RefreshUIMessage {

@ -38,9 +38,9 @@ import org.floens.chan.core.model.Loadable;
import org.floens.chan.core.model.Reply;
import org.floens.chan.core.presenter.ReplyPresenter;
import org.floens.chan.core.settings.ChanSettings;
import org.floens.chan.ui.helper.ImagePickDelegate;
import org.floens.chan.ui.activity.StartActivity;
import org.floens.chan.ui.drawable.DropdownArrowDrawable;
import org.floens.chan.ui.helper.ImagePickDelegate;
import org.floens.chan.ui.theme.ThemeHelper;
import org.floens.chan.ui.view.LoadView;
import org.floens.chan.ui.view.SelectionListeningEditText;

@ -0,0 +1,91 @@
/*
* Clover - 4chan browser https://github.com/Floens/Clover/
* Copyright (C) 2014 Floens
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.floens.chan.ui.settings;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.text.InputType;
import android.view.View;
import android.view.WindowManager;
import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
import android.widget.LinearLayout;
import org.floens.chan.R;
import org.floens.chan.core.settings.Setting;
import static org.floens.chan.utils.AndroidUtils.dp;
/**
* Created by Zetsubou on 02.07.2015
*/
public class IntegerSettingView extends SettingView implements View.OnClickListener {
private final Setting<Integer> setting;
private final String dialogTitle;
public IntegerSettingView(SettingsController settingsController, Setting<Integer> setting, String name, String dialogTitle) {
super(settingsController, name);
this.setting = setting;
this.dialogTitle = dialogTitle;
}
@Override
public void setView(View view) {
super.setView(view);
view.setOnClickListener(this);
}
@Override
public String getBottomDescription() {
return setting.get() != null ? setting.get().toString() : null;
}
@Override
public void onClick(View v) {
LinearLayout container = new LinearLayout(v.getContext());
container.setPadding(dp(24), dp(8), dp(24), 0);
final EditText editText = new EditText(v.getContext());
editText.setImeOptions(EditorInfo.IME_FLAG_NO_FULLSCREEN);
editText.setText(setting.get().toString());
editText.setInputType(InputType.TYPE_CLASS_NUMBER);
editText.setSingleLine(true);
container.addView(editText, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
AlertDialog dialog = new AlertDialog.Builder(v.getContext())
.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface d, int which) {
try {
setting.set(Integer.parseInt(editText.getText().toString()));
} catch (Exception e) {
setting.set(setting.getDefault());
}
settingsController.onPreferenceChange(IntegerSettingView.this);
}
})
.setNegativeButton(R.string.cancel, null)
.setTitle(dialogTitle)
.setView(container)
.create();
dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
dialog.show();
}
}

@ -65,7 +65,10 @@ public class SettingsController extends Controller implements AndroidUtils.OnMea
}
public void onPreferenceChange(SettingView item) {
if ((item instanceof ListSettingView) || (item instanceof StringSettingView) || (item instanceof LinkSettingView)) {
if ((item instanceof ListSettingView)
|| (item instanceof StringSettingView)
|| (item instanceof IntegerSettingView)
|| (item instanceof LinkSettingView)) {
setDescriptionText(item.view, item.getTopDescription(), item.getBottomDescription());
}
}
@ -130,7 +133,10 @@ public class SettingsController extends Controller implements AndroidUtils.OnMea
String topValue = settingView.getTopDescription();
String bottomValue = settingView.getBottomDescription();
if ((settingView instanceof ListSettingView) || (settingView instanceof LinkSettingView) || (settingView instanceof StringSettingView)) {
if ((settingView instanceof ListSettingView)
|| (settingView instanceof LinkSettingView)
|| (settingView instanceof StringSettingView)
|| (settingView instanceof IntegerSettingView)) {
preferenceView = (ViewGroup) inf.inflate(R.layout.setting_link, groupLayout, false);
} else if (settingView instanceof BooleanSettingView) {
preferenceView = (ViewGroup) inf.inflate(R.layout.setting_boolean, groupLayout, false);

@ -1,3 +1,20 @@
/*
* Clover - 4chan browser https://github.com/Floens/Clover/
* Copyright (C) 2014 Floens
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.floens.chan.ui.state;
import android.os.Parcel;

@ -1,3 +1,20 @@
/*
* Clover - 4chan browser https://github.com/Floens/Clover/
* Copyright (C) 2014 Floens
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.floens.chan.ui.theme;
import org.floens.chan.R;

@ -310,6 +310,11 @@ If the pattern matches then the post can be hidden or highlighted.&lt;br>
<string name="setting_confirm_exit_title">Confirm exit</string>
<string name="setting_tap_no_rely">Tap the post number to reply</string>
<string name="settings_group_proxy">HTTP Proxy</string>
<string name="setting_proxy_enabled">Enable proxy</string>
<string name="setting_proxy_address">Proxy server address</string>
<string name="setting_proxy_port">Proxy server port</string>
<string name="settings_screen_watch">Watcher settings</string>
<string name="settings_group_watch">Watcher settings</string>
<string name="setting_watch_info">To watch pins for new posts, turn the thread watcher on.</string>

Loading…
Cancel
Save