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

Remove 'share mailbox download link' button

Browse Source
This commit is contained in:
Torsten Grote
2022-02-14 13:47:04 -03:00
parent 888aea4b37
commit 80bc409225
3 changed files with 1 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java
View File

@@ -1,15 +1,12 @@
package org.briarproject.briar.android.mailbox;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ScrollView;
import android.widget.Toast;
import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
@@ -24,10 +21,7 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.ViewModelProvider;
import static android.content.Intent.ACTION_SEND;
import static android.content.Intent.EXTRA_TEXT;
import static android.view.View.FOCUS_DOWN;
import static android.widget.Toast.LENGTH_LONG;
import static org.briarproject.briar.android.AppModule.getAndroidComponent;
@MethodsNotNullByDefault
@@ -73,9 +67,6 @@ public class SetupDownloadFragment extends Fragment {
permissionManager = new CameraPermissionManager(requireActivity(),
permissionLauncher::launch);
Button shareLinkButton = v.findViewById(R.id.shareLinkButton);
shareLinkButton.setOnClickListener(this::shareLink);
Button scanButton = v.findViewById(R.id.scanButton);
scanButton.setOnClickListener(view -> {
if (permissionManager.checkPermissions()) {
@@ -95,25 +86,6 @@ public class SetupDownloadFragment extends Fragment {
permissionManager.resetPermissions();
}
private void shareLink(View v) {
Context ctx = requireContext();
String download = ctx.getString(R.string.mailbox_share_download);
String text = ctx.getString(R.string.mailbox_share_text, download);
Intent sendIntent = new Intent();
sendIntent.setAction(ACTION_SEND);
sendIntent.putExtra(EXTRA_TEXT, text);
sendIntent.setType("text/plain");
Intent shareIntent = Intent.createChooser(sendIntent, null);
try {
startActivity(shareIntent);
} catch (ActivityNotFoundException e) {
Toast.makeText(ctx, R.string.error_start_activity, LENGTH_LONG)
.show();
}
}
private void scanCode() {
viewModel.onScanButtonClicked();
}

15
briar-android/src/main/res/layout/fragment_mailbox_setup_download.xml
View File

@@ -37,23 +37,10 @@
android:layout_marginBottom="@dimen/margin_large"
android:text="@string/mailbox_setup_intro"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
app:layout_constraintBottom_toTopOf="@+id/shareLinkButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView" />
<Button
android:id="@+id/shareLinkButton"
style="@style/BriarButtonFlat.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_large"
android:drawablePadding="8dp"
android:text="@string/mailbox_setup_download_link"
app:layout_constraintBottom_toTopOf="@+id/scanButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:visibility="visible" />
app:layout_constraintTop_toBottomOf="@+id/imageView" />
<Button
android:id="@+id/scanButton"

2
briar-android/src/main/res/values/strings.xml
View File

@@ -622,8 +622,6 @@
\nYou can find the \"Briar Mailbox\" app on Google Play or wherever you downloaded Briar.</string>
<string name="mailbox_setup_download_link">Share Download Link</string>
<string name="mailbox_setup_button_scan">Scan Mailbox QR code</string>
<string name="mailbox_share_text">Briar Mailbox download information is available here: %s</string>
<string name="mailbox_share_download" translatable="false">https://briarproject.org/download</string>
<string name="permission_camera_qr_denied_body">You have denied access to the camera, but scanning a QR code requires using the camera.\n\nPlease consider granting access.</string>
<string name="mailbox_setup_connecting">Connecting…</string>
<string name="mailbox_setup_qr_code_wrong_title">Wrong QR code</string>