Mastodon/Shitter-android-app
1
0
Fork 0
mirror of https://github.com/nuclearfog/Shitter.git synced 2025-02-07 15:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix, layout fix, translation update

Browse Source
This commit is contained in:
nuclearfog 2023-04-20 15:55:33 +02:00
parent a3e45a8c91
commit 12080cea61
No known key found for this signature in database
GPG Key ID: 03488A185C476379
9 changed files with 91 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/MastodonException.java
View File

@ -8,6 +8,7 @@ import org.json.JSONObject;
import org.nuclearfog.twidda.backend.api.ConnectionException;
import java.io.IOException;
import java.net.ConnectException;
import java.net.UnknownHostException;
import okhttp3.Response;
@ -42,9 +43,10 @@ public class MastodonException extends ConnectionException {
/**
* caused by interrupt
*/
private static final int ERRO_INTERRUPTED = -4;
private static final int ERROR_INTERRUPTED = -4;
private int httpCode = 0;
private int errorCode = UNKNOWN_ERROR;
private String errorMessage = "";
@ -58,8 +60,10 @@ public class MastodonException extends ConnectionException {
errorCode = ERROR_NETWORK;
} else if (e instanceof JSONException) {
errorCode = ERROR_JSON;
} else if (e instanceof ConnectException) {
errorCode = NO_CONNECTION;
} else if (getCause() instanceof InterruptedException) {
errorCode = ERRO_INTERRUPTED;
errorCode = ERROR_INTERRUPTED;
}
}
@ -68,7 +72,7 @@ public class MastodonException extends ConnectionException {
*/
MastodonException(Response response) {
super(response.message());
errorCode = response.code();
httpCode = response.code();
ResponseBody body = response.body();
if (body != null) {
try {
@ -97,7 +101,9 @@ public class MastodonException extends ConnectionException {
@Override
public int getErrorCode() {
switch (errorCode) {
if (errorCode != UNKNOWN_ERROR)
return errorCode;
switch (httpCode) {
case 404:
if (errorMessage.startsWith(MESSAGE_NOT_FOUND)) {
return RESOURCE_NOT_FOUND;
@ -114,18 +120,8 @@ public class MastodonException extends ConnectionException {
case 503:
return SERVICE_UNAVAILABLE;
case ERROR_NETWORK:
return NETWORK_CONNECTION;
case ERROR_JSON:
return JSON_FORMAT;
case ERRO_INTERRUPTED:
return INTERRUPTED;
default:
case UNKNOWN_ERROR:
return ERROR_NOT_DEFINED;
return errorCode;
}
}

3
app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/impl/MastodonTrend.java
View File

@ -4,6 +4,7 @@ import androidx.annotation.NonNull;
import org.json.JSONArray;
import org.json.JSONObject;
import org.nuclearfog.twidda.model.Location;
import org.nuclearfog.twidda.model.Trend;
/**
@ -41,7 +42,7 @@ public class MastodonTrend implements Trend {
@Override
public long getLocationId() {
return -1L;
return Location.NO_ID;
}

2
app/src/main/java/org/nuclearfog/twidda/model/Location.java
View File

@ -9,7 +9,7 @@ import java.io.Serializable;
*/
public interface Location extends Serializable, Comparable<Location> {
long NO_ID = 0;
long NO_ID = -1L;
/**
* @return ID of the place (World ID)

17
app/src/main/java/org/nuclearfog/twidda/ui/activities/MainActivity.java
View File

@ -116,24 +116,19 @@ public class MainActivity extends AppCompatActivity implements ActivityResultCal
finish();
break;
case AccountActivity.RETURN_ACCOUNT_CHANGED:
case LoginActivity.RETURN_LOGIN_SUCCESSFUL:
setupAdapter();
loginIntent = null;
break;
case SettingsActivity.RETURN_APP_LOGOUT:
adapter.clear();
break;
case AccountActivity.RETURN_ACCOUNT_CHANGED:
case LoginActivity.RETURN_LOGIN_SUCCESSFUL:
loginIntent = null;
// fall through
default:
case SettingsActivity.RETURN_DATA_CLEARED:
case SettingsActivity.RETURN_SETTINGS_CHANGED:
case AccountActivity.RETURN_SETTINGS_CHANGED:
AppStyles.setTheme(root);
AppStyles.setOverflowIcon(toolbar, settings.getIconColor());
tabSelector.updateTheme();
adapter.notifySettingsChanged();
setupAdapter();
break;
}
}

138
app/src/main/java/org/nuclearfog/twidda/ui/activities/SettingsActivity.java
View File

@ -69,11 +69,6 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
*/
public static final int RETURN_APP_LOGOUT = 0x530;
/**
* return code to recognize {@link MainActivity} that the database was removed
*/
public static final int RETURN_DATA_CLEARED = 0x955;
/**
* return code to recognize {@link MainActivity} that settings may changed
*/
@ -97,8 +92,8 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
private GlobalSettings settings;
private Configuration configuration;
private DatabaseAction databaseAsync;
private LocationLoader locationAsync;
private DatabaseAction databaseAction;
private LocationLoader locationLoader;
private LocationAdapter locationAdapter;
private BaseAdapter fontAdapter, scaleAdapter;
@ -106,10 +101,10 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
private Dialog color_dialog_selector, appInfo, license;
private ConfirmDialog confirmDialog;
private View enableAuthTxt;
private EditText proxyAddr, proxyPort, proxyUser, proxyPass;
private SwitchButton enableProxy, enableAuth;
private Spinner locationSpinner;
private View enable_auth_label;
private EditText proxy_address, proxy_port, proxy_user, proxy_pass;
private SwitchButton enable_proxy, enable_auth;
private Spinner location_dropdown;
private TextView list_size;
private ViewGroup root;
private Button[] colorButtons = new Button[COLOR_COUNT];
@ -147,10 +142,10 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
SeekBar listSizeSelector = findViewById(R.id.settings_list_seek);
Spinner fontSelector = findViewById(R.id.spinner_font);
Spinner scaleSelector = findViewById(R.id.spinner_scale);
enableProxy = findViewById(R.id.settings_enable_proxy);
enableAuth = findViewById(R.id.settings_enable_auth);
locationSpinner = findViewById(R.id.spinner_woeid);
enableAuthTxt = findViewById(R.id.settings_enable_auth_descr);
enable_proxy = findViewById(R.id.settings_enable_proxy);
enable_auth = findViewById(R.id.settings_enable_auth);
location_dropdown = findViewById(R.id.spinner_woeid);
enable_auth_label = findViewById(R.id.settings_enable_auth_descr);
colorButtons[COLOR_BACKGROUND] = findViewById(R.id.color_background);
colorButtons[COLOR_TEXT] = findViewById(R.id.color_text);
colorButtons[COLOR_WINDOW] = findViewById(R.id.color_window);
@ -161,10 +156,10 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
colorButtons[COLOR_FAVORITE] = findViewById(R.id.color_fav);
colorButtons[COLOR_FOLLOW_REQUEST] = findViewById(R.id.color_f_req);
colorButtons[COLOR_FOLLOWING] = findViewById(R.id.color_follow);
proxyAddr = findViewById(R.id.edit_proxy_address);
proxyPort = findViewById(R.id.edit_proxy_port);
proxyUser = findViewById(R.id.edit_proxyuser);
proxyPass = findViewById(R.id.edit_proxypass);
proxy_address = findViewById(R.id.edit_proxy_address);
proxy_port = findViewById(R.id.edit_proxy_port);
proxy_user = findViewById(R.id.edit_proxyuser);
proxy_pass = findViewById(R.id.edit_proxypass);
list_size = findViewById(R.id.settings_list_size);
root = findViewById(R.id.settings_layout);
@ -175,8 +170,8 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
configuration = settings.getLogin().getConfiguration();
locationAdapter = new LocationAdapter(settings);
locationAdapter.addItem(settings.getTrendLocation());
locationSpinner.setAdapter(locationAdapter);
locationSpinner.setSelected(false);
location_dropdown.setAdapter(locationAdapter);
location_dropdown.setSelected(false);
fontAdapter = new FontAdapter(settings);
scaleAdapter = new ScaleAdapter(settings);
fontSelector.setAdapter(fontAdapter);
@ -192,8 +187,8 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
confirmDialog = new ConfirmDialog(this);
appInfo = new InfoDialog(this);
license = new LicenseDialog(this);
locationAsync = new LocationLoader(this);
databaseAsync = new DatabaseAction(this);
locationLoader = new LocationLoader(this);
databaseAction = new DatabaseAction(this);
if (configuration != Configuration.TWITTER1 && configuration != Configuration.TWITTER2) {
enableLocalTl.setVisibility(View.VISIBLE);
@ -203,15 +198,15 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
user_card.setVisibility(View.GONE);
}
if (!settings.isProxyEnabled()) {
proxyAddr.setVisibility(View.GONE);
proxyPort.setVisibility(View.GONE);
proxyUser.setVisibility(View.GONE);
proxyPass.setVisibility(View.GONE);
enableAuth.setVisibility(View.GONE);
enableAuthTxt.setVisibility(View.GONE);
proxy_address.setVisibility(View.GONE);
proxy_port.setVisibility(View.GONE);
proxy_user.setVisibility(View.GONE);
proxy_pass.setVisibility(View.GONE);
enable_auth.setVisibility(View.GONE);
enable_auth_label.setVisibility(View.GONE);
} else if (!settings.isProxyAuthSet()) {
proxyUser.setVisibility(View.GONE);
proxyPass.setVisibility(View.GONE);
proxy_user.setVisibility(View.GONE);
proxy_pass.setVisibility(View.GONE);
}
if (settings.likeEnabled()) {
colorButtons[COLOR_FAVORITE].setText(R.string.settings_color_like);
@ -225,12 +220,12 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
enableLocalTl.setCheckedImmediately(settings.useLocalTimeline());
hideSensitive.setCheckedImmediately(settings.hideSensitiveEnabled());
enableStatusIcons.setCheckedImmediately(settings.statusIndicatorsEnabled());
enableProxy.setCheckedImmediately(settings.isProxyEnabled());
enableAuth.setCheckedImmediately(settings.isProxyAuthSet());
proxyAddr.setText(settings.getProxyHost());
proxyPort.setText(settings.getProxyPort());
proxyUser.setText(settings.getProxyUser());
proxyPass.setText(settings.getProxyPass());
enable_proxy.setCheckedImmediately(settings.isProxyEnabled());
enable_auth.setCheckedImmediately(settings.isProxyAuthSet());
proxy_address.setText(settings.getProxyHost());
proxy_port.setText(settings.getProxyPort());
proxy_user.setText(settings.getProxyUser());
proxy_pass.setText(settings.getProxyPass());
list_size.setText(Integer.toString(settings.getListSize()));
listSizeSelector.setProgress(settings.getListSize() / 10 - 1);
setButtonColors();
@ -245,8 +240,8 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
enableLocalTl.setOnCheckedChangeListener(this);
enableStatusIcons.setOnCheckedChangeListener(this);
hideSensitive.setOnCheckedChangeListener(this);
enableProxy.setOnCheckedChangeListener(this);
enableAuth.setOnCheckedChangeListener(this);
enable_proxy.setOnCheckedChangeListener(this);
enable_auth.setOnCheckedChangeListener(this);
toolbarOverlap.setOnCheckedChangeListener(this);
fontSelector.setOnItemSelectedListener(this);
scaleSelector.setOnItemSelectedListener(this);
@ -260,8 +255,8 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
super.onStart();
setResult(RETURN_SETTINGS_CHANGED);
if (configuration == Configuration.TWITTER1 || configuration == Configuration.TWITTER2) {
if (locationSpinner.getCount() <= 1) {
locationAsync.execute(null, locationResult);
if (location_dropdown.getCount() <= 1) {
locationLoader.execute(null, locationResult);
}
}
}
@ -279,8 +274,8 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
@Override
protected void onDestroy() {
locationAsync.cancel();
databaseAsync.cancel();
locationLoader.cancel();
databaseAction.cancel();
super.onDestroy();
}
@ -309,11 +304,11 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
// remove account from database
if (type == ConfirmDialog.APP_LOG_OUT) {
settings.setLogin(null, true);
databaseAsync.execute(new DatabaseParam(DatabaseParam.LOGOUT), databaseResult);
databaseAction.execute(new DatabaseParam(DatabaseParam.LOGOUT), databaseResult);
}
// confirm delete app data and cache
else if (type == ConfirmDialog.DELETE_APP_DATA) {
databaseAsync.execute(new DatabaseParam(DatabaseParam.DELETE), databaseResult);
databaseAction.execute(new DatabaseParam(DatabaseParam.DELETE), databaseResult);
}
// confirm leaving without saving proxy changes
else if (type == ConfirmDialog.WRONG_PROXY) {
@ -507,26 +502,26 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
// enable proxy settings
else if (c.getId() == R.id.settings_enable_proxy) {
if (checked) {
proxyAddr.setVisibility(View.VISIBLE);
proxyPort.setVisibility(View.VISIBLE);
enableAuth.setVisibility(View.VISIBLE);
enableAuthTxt.setVisibility(View.VISIBLE);
proxy_address.setVisibility(View.VISIBLE);
proxy_port.setVisibility(View.VISIBLE);
enable_auth.setVisibility(View.VISIBLE);
enable_auth_label.setVisibility(View.VISIBLE);
} else {
proxyAddr.setVisibility(View.GONE);
proxyPort.setVisibility(View.GONE);
enableAuthTxt.setVisibility(View.GONE);
enableAuth.setVisibility(View.GONE);
enableAuth.setChecked(false);
proxy_address.setVisibility(View.GONE);
proxy_port.setVisibility(View.GONE);
enable_auth_label.setVisibility(View.GONE);
enable_auth.setVisibility(View.GONE);
enable_auth.setChecked(false);
}
}
// enable proxy authentication
else if (c.getId() == R.id.settings_enable_auth) {
if (checked) {
proxyUser.setVisibility(View.VISIBLE);
proxyPass.setVisibility(View.VISIBLE);
proxy_user.setVisibility(View.VISIBLE);
proxy_pass.setVisibility(View.VISIBLE);
} else {
proxyUser.setVisibility(View.GONE);
proxyPass.setVisibility(View.GONE);
proxy_user.setVisibility(View.GONE);
proxy_pass.setVisibility(View.GONE);
}
}
// hide sensitive content
@ -593,7 +588,6 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
private void onDatabaseResult(@NonNull DatabaseResult result) {
switch (result.mode) {
case DatabaseResult.DELETE:
setResult(RETURN_DATA_CLEARED);
Toast.makeText(getApplicationContext(), R.string.info_database_cleared, Toast.LENGTH_SHORT).show();
break;
@ -619,8 +613,8 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
locationAdapter.replaceItems(result.locations);
int position = locationAdapter.indexOf(settings.getTrendLocation());
if (position >= 0)
locationSpinner.setSelection(position, false);
locationSpinner.setOnItemSelectedListener(this);
location_dropdown.setSelection(position, false);
location_dropdown.setOnItemSelectedListener(this);
} else {
String message = ErrorHandler.getErrorMessage(this, result.exception);
Toast.makeText(getApplicationContext(), message, Toast.LENGTH_SHORT).show();
@ -663,35 +657,35 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
private boolean saveConnectionSettings() {
boolean checkPassed = true;
// check if proxy settings are correct
if (enableProxy.isChecked()) {
checkPassed = proxyAddr.length() > 0 && proxyPort.length() > 0;
if (enable_proxy.isChecked()) {
checkPassed = proxy_address.length() > 0 && proxy_port.length() > 0;
// check IP address
if (checkPassed) {
Matcher ipMatch = Patterns.IP_ADDRESS.matcher(proxyAddr.getText());
Matcher ipMatch = Patterns.IP_ADDRESS.matcher(proxy_address.getText());
checkPassed = ipMatch.matches();
}
// check Port number
if (checkPassed) {
int port = 0;
String portStr = proxyPort.getText().toString();
String portStr = proxy_port.getText().toString();
if (!portStr.isEmpty()) {
port = Integer.parseInt(portStr);
}
checkPassed = port > 0 && port < 65536;
}
// check user login
if (enableAuth.isChecked() && checkPassed) {
checkPassed = proxyUser.length() > 0 && proxyPass.length() > 0;
if (enable_auth.isChecked() && checkPassed) {
checkPassed = proxy_user.length() > 0 && proxy_pass.length() > 0;
}
// save settings if correct
if (checkPassed) {
String proxyAddrStr = proxyAddr.getText().toString();
String proxyPortStr = proxyPort.getText().toString();
String proxyUserStr = proxyUser.getText().toString();
String proxyPassStr = proxyPass.getText().toString();
String proxyAddrStr = proxy_address.getText().toString();
String proxyPortStr = proxy_port.getText().toString();
String proxyUserStr = proxy_user.getText().toString();
String proxyPassStr = proxy_pass.getText().toString();
settings.setProxyServer(proxyAddrStr, proxyPortStr, proxyUserStr, proxyPassStr);
settings.setProxyEnabled(true);
settings.setProxyAuthSet(enableAuth.isChecked());
settings.setProxyAuthSet(enable_auth.isChecked());
}
} else {
settings.clearProxyServer();

1
app/src/main/res/layout/page_profile.xml
View File

@ -6,6 +6,7 @@
android:fitsSystemWindows="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:overScrollMode="never"
tools:context=".ui.activities.ProfileActivity">
<LinearLayout

3
app/src/main/res/layout/page_status.xml
View File

@ -19,8 +19,7 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:nextFocusUp="@id/page_status_header"
android:nextFocusDown="@id/page_status_body">
android:overScrollMode="never">
<LinearLayout
android:layout_width="match_parent"

3
app/src/main/res/values-de-rDE/strings.xml
View File

@ -27,6 +27,7 @@
<string name="info_database_cleared">Datenbank gelöscht</string>
<string name="info_notification_dismiss">Nachricht verworfen</string>
<string name="info_error">Fehler!</string>
<string name="menu_status_edit">bearbeiten</string>
<string name="menu_status_delete">löschen</string>
<string name="menu_status_open_browser">Im Browser öffnen</string>
<string name="error_not_found">nicht gefunden!</string>
@ -228,7 +229,7 @@
<string name="menu_status_unhide">Antwort einblenden</string>
<string name="info_reply_hidden">Antwort wurde ausgeblendet</string>
<string name="info_reply_unhidden">Antwort wurde eingeblendet</string>
<string name="settings_description_enable_twitter_alt">nitter.net für Links benutzen</string>
<string name="settings_description_enable_twitter_alt">öffne Twitter-Links mit Nitter</string>
<string name="confirm_unknown_error">Unbekannter Fehler!</string>
<string name="error_invalid_media">Ungültige Mediendatei!</string>
<string name="menu_follow_requests">Anfragen</string>

2
app/src/main/res/values/strings.xml
View File

@ -262,7 +262,7 @@
<string name="settings_app_information">App source code:</string>
<string name="settings_enable_toolbar_overlap">Collapsed profile layout</string>
<string name="settings_look">Look</string>
<string name="settings_description_enable_twitter_alt">use nitter.net for links</string>
<string name="settings_description_enable_twitter_alt">use Nitter to open Twitter links</string>
<string name="settings_description_local_timeline">show local timelines only</string>
<string name="item_load_more">load more</string>
<string name="item_image_save">save image</string>