Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Upload with Tor

This commit is contained in:
tom79 2019-06-15 18:42:14 +02:00
parent 9fd697e31b
commit b9bd118df2
3 changed files with 8 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/app/fedilab/android/client/API.java
View File

@ -4102,7 +4102,9 @@ public class API {
JSONObject resobj = jsonArray.getJSONObject(i);
Status status = parseStatuses(context, resobj);
i++;
statuses.add(status);
if( status != null) {
statuses.add(status);
}
}
} catch (JSONException e) {

6
app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java
View File

@ -566,7 +566,11 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
bar.setHeight1(30);
items.add(bar);
}else {
BarItem bar = new BarItem(pollOption.getTitle(), value, "%", ContextCompat.getColor(context, R.color.mastodonC2), Color.WHITE);
BarItem bar;
if( theme == Helper.THEME_LIGHT)
bar = new BarItem(pollOption.getTitle(), value, "%", ContextCompat.getColor(context, R.color.mastodonC2), Color.BLACK);
else
bar = new BarItem(pollOption.getTitle(), value, "%", ContextCompat.getColor(context, R.color.mastodonC2), Color.WHITE);
bar.setRounded(true);
bar.setHeight1(30);
items.add(bar);

42
app/src/main/java/app/fedilab/android/helper/Helper.java
View File

@ -4027,12 +4027,6 @@ public class Helper {
public static void initNetCipher(Context context) {
Context appContext = context.getApplicationContext();
if (!OrbotHelper.get(appContext).init() && OrbotHelper.isOrbotInstalled(appContext)) {
orbotConnected = false;
context.startActivity(OrbotHelper.getOrbotInstallIntent(appContext));
return;
}
try {
StrongOkHttpClientBuilder.forMaxSecurity(appContext).build(new StrongBuilder.Callback<OkHttpClient>() {
@Override
@ -4060,42 +4054,6 @@ public class Helper {
}
public static void initNetCipherHttp(Context context) {
Context appContext = context.getApplicationContext();
if (!OrbotHelper.get(appContext).init() && OrbotHelper.isOrbotInstalled(appContext)) {
orbotConnected = false;
context.startActivity(OrbotHelper.getOrbotInstallIntent(appContext));
return;
}
try {
StrongConnectionBuilder.forMaxSecurity(appContext).build(new StrongConnectionBuilder.Callback<HttpURLConnection>() {
@Override
public void onConnected(HttpURLConnection httpURLConnection) {
}
@Override
public void onConnectionException(Exception e) {
}
@Override
public void onTimeout() {
}
@Override
public void onInvalid() {
}
});
} catch (Exception ignored) { }
}
public static OkHttpClient getHttpClient(Context context) {
OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder()
.followRedirects(true)