Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 11:19:04 +01:00
Code Issues Projects Releases Wiki Activity

Contact failure: Add better icon and remove technical error message

Browse Source
This commit is contained in:
Torsten Grote
2018-08-14 19:19:56 -03:00
parent d3e44358a4
commit 656ca8d67a
8 changed files with 112 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeActivity.java
View File

@@ -97,14 +97,14 @@ public class ContactExchangeActivity extends KeyAgreementActivity implements
@Override
public void contactExchangeFailed() {
runOnUiThreadUnlessDestroyed(() -> {
showErrorFragment(R.string.contact_exchange_failed);
showErrorFragment(R.string.connection_error_explanation);
});
}
@UiThread
@Override
public void keyAgreementFailed() {
showErrorFragment(R.string.connection_failed);
showErrorFragment(R.string.connection_error_explanation);
}
@UiThread

32
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeErrorFragment.java
View File

@@ -2,6 +2,7 @@ package org.briarproject.briar.android.keyagreement;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -28,10 +29,10 @@ public class ContactExchangeErrorFragment extends BaseFragment {
ContactExchangeErrorFragment.class.getName();
private static final String ERROR_MSG = "errorMessage";
public static ContactExchangeErrorFragment newInstance(String message) {
public static ContactExchangeErrorFragment newInstance(@StringRes int res) {
ContactExchangeErrorFragment f = new ContactExchangeErrorFragment();
Bundle args = new Bundle();
args.putString(ERROR_MSG, message);
args.putInt(ERROR_MSG, res);
f.setArguments(args);
return f;
}
@@ -39,24 +40,11 @@ public class ContactExchangeErrorFragment extends BaseFragment {
@Inject
AndroidExecutor androidExecutor;
private String errorMessage;
@Override
public String getUniqueTag() {
return TAG;
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Bundle args = getArguments();
if (args == null) {
throw new IllegalArgumentException("Use newInstance()");
}
errorMessage = args.getString(ERROR_MSG);
}
@Nullable
@Override
public View onCreateView(LayoutInflater inflater,
@@ -66,13 +54,17 @@ public class ContactExchangeErrorFragment extends BaseFragment {
.inflate(R.layout.fragment_error_contact_exchange, container,
false);
// make feedback link clickable
// set humanized error message
TextView explanation = v.findViewById(R.id.errorMessage);
onSingleLinkClick(explanation, this::triggerFeedback);
Bundle args = getArguments();
if (args == null) {
throw new IllegalArgumentException("Use newInstance()");
}
explanation.setText(args.getInt(ERROR_MSG));
// technical error message
TextView msg = v.findViewById(R.id.errorMessageTech);
msg.setText(errorMessage);
// make feedback link clickable
TextView sendFeedback = v.findViewById(R.id.sendFeedback);
onSingleLinkClick(sendFeedback, this::triggerFeedback);
// buttons
Button tryAgain = v.findViewById(R.id.tryAgainButton);

3
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java
View File

@@ -188,8 +188,7 @@ public abstract class KeyAgreementActivity extends BriarActivity implements
}
protected void showErrorFragment(@StringRes int errorResId) {
String errorMessage = getString(errorResId);
BaseFragment f = ContactExchangeErrorFragment.newInstance(errorMessage);
BaseFragment f = ContactExchangeErrorFragment.newInstance(errorResId);
showNextFragment(f);
}