Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Replace final Bluetooth connection fragments with toasts

Browse Source
This commit is contained in:
Torsten Grote
2021-08-30 15:33:59 +02:00
parent 1be8ac6e14
commit 822a58c8a6
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
briar-android/src/main/java/org/briarproject/briar/android/contact/connect/ConnectViaBluetoothActivity.java
View File

@@ -3,6 +3,7 @@ package org.briarproject.briar.android.contact.connect;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.MenuItem; import android.view.MenuItem;
import android.widget.Toast;
import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.ContactId;
import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
@@ -10,7 +11,6 @@ import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
import org.briarproject.briar.R; import org.briarproject.briar.R;
import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.activity.BriarActivity; import org.briarproject.briar.android.activity.BriarActivity;
import org.briarproject.briar.android.fragment.FinalFragment;
import javax.inject.Inject; import javax.inject.Inject;
@@ -19,6 +19,7 @@ import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import static android.widget.Toast.LENGTH_LONG;
import static java.util.Objects.requireNonNull; import static java.util.Objects.requireNonNull;
import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID; import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
import static org.briarproject.briar.android.util.UiUtils.showFragment; import static org.briarproject.briar.android.util.UiUtils.showFragment;
@@ -78,27 +79,20 @@ public class ConnectViaBluetoothActivity extends BriarActivity {
} }
private void onStateChanged(ConnectViaBluetoothState state) { private void onStateChanged(ConnectViaBluetoothState state) {
Fragment f;
String tag = FinalFragment.TAG;
if (state instanceof ConnectViaBluetoothState.Connecting) { if (state instanceof ConnectViaBluetoothState.Connecting) {
f = new BluetoothProgressFragment(); Fragment f = new BluetoothProgressFragment();
tag = BluetoothProgressFragment.TAG; String tag = BluetoothProgressFragment.TAG;
showFragment(getSupportFragmentManager(), f, tag, false);
} else if (state instanceof ConnectViaBluetoothState.Success) { } else if (state instanceof ConnectViaBluetoothState.Success) {
f = FinalFragment.newInstance( Toast.makeText(this, R.string.connect_via_bluetooth_success,
R.string.connect_via_bluetooth_success, LENGTH_LONG).show();
R.drawable.ic_check_circle_outline, supportFinishAfterTransition();
R.color.briar_brand_green,
0
);
} else if (state instanceof ConnectViaBluetoothState.Error) { } else if (state instanceof ConnectViaBluetoothState.Error) {
f = FinalFragment.newInstance( Toast.makeText(this,
R.string.error, ((ConnectViaBluetoothState.Error) state).errorRes,
R.drawable.alerts_and_states_error, LENGTH_LONG).show();
R.color.briar_red_500, supportFinishAfterTransition();
((ConnectViaBluetoothState.Error) state).errorRes
);
} else throw new AssertionError(); } else throw new AssertionError();
showFragment(getSupportFragmentManager(), f, tag, false);
} }
} }