Mastodon
/
Shitter-android-app
mirror of https://github.com/nuclearfog/Shitter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed build error, cleanup

This commit is contained in:
nuclearfog 2023-03-04 19:00:34 +01:00
parent 074fccdec1
commit 413e5dca54
No known key found for this signature in database
GPG Key ID: 03488A185C476379
1 changed files with 28 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,5 @@
package org.nuclearfog.twidda.ui.activities; package org.nuclearfog.twidda.ui.activities;
import static android.view.View.GONE;
import static android.view.View.OnClickListener;
import static android.view.View.VISIBLE;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
@ -13,6 +9,7 @@ import android.util.Patterns;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.AdapterView.OnItemSelectedListener; import android.widget.AdapterView.OnItemSelectedListener;
@ -41,7 +38,6 @@ import com.kyleduo.switchbutton.SwitchButton;
import org.nuclearfog.twidda.R; import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.backend.async.DatabaseAction; import org.nuclearfog.twidda.backend.async.DatabaseAction;
import org.nuclearfog.twidda.backend.async.DatabaseAction.DatabaseParam; import org.nuclearfog.twidda.backend.async.DatabaseAction.DatabaseParam;
import org.nuclearfog.twidda.backend.async.DatabaseAction.DatabaseResult;
import org.nuclearfog.twidda.backend.async.LocationLoader; import org.nuclearfog.twidda.backend.async.LocationLoader;
import org.nuclearfog.twidda.backend.async.LocationLoader.LocationLoaderResult; import org.nuclearfog.twidda.backend.async.LocationLoader.LocationLoaderResult;
import org.nuclearfog.twidda.backend.utils.AppStyles; import org.nuclearfog.twidda.backend.utils.AppStyles;
@ -196,23 +192,23 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
databaseAsync = new DatabaseAction(this); databaseAsync = new DatabaseAction(this);
if (configuration != Configuration.TWITTER1 && configuration != Configuration.TWITTER2) { if (configuration != Configuration.TWITTER1 && configuration != Configuration.TWITTER2) {
enableTwitterAlt.setVisibility(GONE); enableTwitterAlt.setVisibility(View.GONE);
EnableTwitterAltDescr.setVisibility(GONE); EnableTwitterAltDescr.setVisibility(View.GONE);
trend_card.setVisibility(GONE); trend_card.setVisibility(View.GONE);
} }
if (!settings.isLoggedIn()) { if (!settings.isLoggedIn()) {
user_card.setVisibility(GONE); user_card.setVisibility(View.GONE);
} }
if (!settings.isProxyEnabled()) { if (!settings.isProxyEnabled()) {
proxyAddr.setVisibility(GONE); proxyAddr.setVisibility(View.GONE);
proxyPort.setVisibility(GONE); proxyPort.setVisibility(View.GONE);
proxyUser.setVisibility(GONE); proxyUser.setVisibility(View.GONE);
proxyPass.setVisibility(GONE); proxyPass.setVisibility(View.GONE);
enableAuth.setVisibility(GONE); enableAuth.setVisibility(View.GONE);
enableAuthTxt.setVisibility(GONE); enableAuthTxt.setVisibility(View.GONE);
} else if (!settings.isProxyAuthSet()) { } else if (!settings.isProxyAuthSet()) {
proxyUser.setVisibility(GONE); proxyUser.setVisibility(View.GONE);
proxyPass.setVisibility(GONE); proxyPass.setVisibility(View.GONE);
} }
if (settings.likeEnabled()) { if (settings.likeEnabled()) {
colorButtons[COLOR_FAVORITE].setText(R.string.settings_color_like); colorButtons[COLOR_FAVORITE].setText(R.string.settings_color_like);
@ -513,26 +509,26 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
// enable proxy settings // enable proxy settings
else if (c.getId() == R.id.settings_enable_proxy) { else if (c.getId() == R.id.settings_enable_proxy) {
if (checked) { if (checked) {
proxyAddr.setVisibility(VISIBLE); proxyAddr.setVisibility(View.VISIBLE);
proxyPort.setVisibility(VISIBLE); proxyPort.setVisibility(View.VISIBLE);
enableAuth.setVisibility(VISIBLE); enableAuth.setVisibility(View.VISIBLE);
enableAuthTxt.setVisibility(VISIBLE); enableAuthTxt.setVisibility(View.VISIBLE);
} else { } else {
proxyAddr.setVisibility(GONE); proxyAddr.setVisibility(View.GONE);
proxyPort.setVisibility(GONE); proxyPort.setVisibility(View.GONE);
enableAuthTxt.setVisibility(GONE); enableAuthTxt.setVisibility(View.GONE);
enableAuth.setVisibility(GONE); enableAuth.setVisibility(View.GONE);
enableAuth.setChecked(false); enableAuth.setChecked(false);
} }
} }
//enable proxy authentication //enable proxy authentication
else if (c.getId() == R.id.settings_enable_auth) { else if (c.getId() == R.id.settings_enable_auth) {
if (checked) { if (checked) {
proxyUser.setVisibility(VISIBLE); proxyUser.setVisibility(View.VISIBLE);
proxyPass.setVisibility(VISIBLE); proxyPass.setVisibility(View.VISIBLE);
} else { } else {
proxyUser.setVisibility(GONE); proxyUser.setVisibility(View.GONE);
proxyPass.setVisibility(GONE); proxyPass.setVisibility(View.GONE);
} }
} }
} }
@ -591,20 +587,10 @@ public class SettingsActivity extends AppCompatActivity implements OnClickListen
/** /**
* called from {@link DatabaseAction} * called from {@link DatabaseAction}
*
* @param result result from {@link DatabaseAction}
*/ */
public void onDatabaseResult(DatabaseResult result) { public void onDatabaseResult(Void v) {
switch (result.mode) { setResult(RETURN_DATA_CLEARED);
case DatabaseResult.DELETE: Toast.makeText(getApplicationContext(), R.string.info_database_cleared, Toast.LENGTH_SHORT).show();
setResult(RETURN_DATA_CLEARED);
Toast.makeText(getApplicationContext(), R.string.info_database_cleared, Toast.LENGTH_SHORT).show();
break;
case DatabaseResult.ERROR:
Toast.makeText(getApplicationContext(), R.string.error_database_cleared, Toast.LENGTH_SHORT).show();
break;
}
} }
/** /**