chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Simplify the error messages and remove unused strings.

Browse source
This commit is contained in:
Vavassor 2017-04-06 03:09:49 -04:00
commit a9970ee875
7 changed files with 66 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
View file

@ -246,7 +246,7 @@ public class AccountActivity extends BaseActivity {
}
private void onObtainAccountFailure() {
Snackbar.make(tabLayout, R.string.error_obtain_account, Snackbar.LENGTH_LONG)
Snackbar.make(tabLayout, R.string.error_generic, Snackbar.LENGTH_LONG)
.setAction(R.string.action_retry, new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -377,19 +377,14 @@ public class AccountActivity extends BaseActivity {
}
private void onFollowFailure(final String id) {
int messageId;
if (following) {
messageId = R.string.error_unfollowing;
} else {
messageId = R.string.error_following;
}
View.OnClickListener listener = new View.OnClickListener() {
@Override
public void onClick(View v) {
follow(id);
}
};
Snackbar.make(findViewById(R.id.activity_account), messageId, Snackbar.LENGTH_LONG)
View anyView = findViewById(R.id.activity_account);
Snackbar.make(anyView, R.string.error_generic, Snackbar.LENGTH_LONG)
.setAction(R.string.action_retry, listener)
.show();
}
@ -419,19 +414,14 @@ public class AccountActivity extends BaseActivity {
}
private void onBlockFailure(final String id) {
int messageId;
if (blocking) {
messageId = R.string.error_unblocking;
} else {
messageId = R.string.error_blocking;
}
View.OnClickListener listener = new View.OnClickListener() {
@Override
public void onClick(View v) {
block(id);
}
};
Snackbar.make(findViewById(R.id.activity_account), messageId, Snackbar.LENGTH_LONG)
View anyView = findViewById(R.id.activity_account);
Snackbar.make(anyView, R.string.error_generic, Snackbar.LENGTH_LONG)
.setAction(R.string.action_retry, listener)
.show();
}
@ -463,22 +453,14 @@ public class AccountActivity extends BaseActivity {
}
private void onMuteFailure(final String id) {
int messageId;
if (muting) {
messageId = R.string.error_unmuting;
} else {
messageId = R.string.error_muting;
}
View.OnClickListener listener = new View.OnClickListener() {
@Override
public void onClick(View v) {
mute(id);
}
};
Snackbar.make(findViewById(R.id.activity_account), messageId, Snackbar.LENGTH_LONG)
View anyView = findViewById(R.id.activity_account);
Snackbar.make(anyView, R.string.error_generic, Snackbar.LENGTH_LONG)
.setAction(R.string.action_retry, listener)
.show();
}

2
app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
View file

@ -790,7 +790,7 @@ public class ComposeActivity extends BaseActivity implements ComposeOptionsFrag
}
private void onSendFailure() {
textEditor.setError(getString(R.string.error_sending_status));
textEditor.setError(getString(R.string.error_generic));
statusAlreadyInFlight = false;
}

2
app/src/main/java/com/keylesspalace/tusky/ReportActivity.java
View file

@ -139,7 +139,7 @@ public class ReportActivity extends BaseActivity {
private void onSendFailure(final String accountId, final String[] statusIds,
final String comment) {
Snackbar.make(anyView, R.string.error_report_unsent, Snackbar.LENGTH_LONG)
Snackbar.make(anyView, R.string.error_generic, Snackbar.LENGTH_LONG)
.setAction(R.string.action_retry, new View.OnClickListener() {
@Override
public void onClick(View v) {

2
app/src/main/java/com/keylesspalace/tusky/ViewThreadFragment.java
View file

@ -129,7 +129,7 @@ public class ViewThreadFragment extends SFragment implements StatusActionListene
private void onThreadRequestFailure(final String id) {
View view = getView();
if (view != null) {
Snackbar.make(view, R.string.error_view_thread, Snackbar.LENGTH_LONG)
Snackbar.make(view, R.string.error_generic, Snackbar.LENGTH_LONG)
.setAction(R.string.action_retry, new View.OnClickListener() {
@Override
public void onClick(View v) {