mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-17 21:29:54 +01:00
Catch ActivityNotFoundException when choosing files.
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
package org.briarproject.briar.android.conversation;
|
package org.briarproject.briar.android.conversation;
|
||||||
|
|
||||||
import android.annotation.SuppressLint;
|
import android.annotation.SuppressLint;
|
||||||
|
import android.content.ActivityNotFoundException;
|
||||||
import android.content.DialogInterface;
|
import android.content.DialogInterface;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.graphics.drawable.Drawable;
|
import android.graphics.drawable.Drawable;
|
||||||
@@ -121,6 +122,7 @@ import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt;
|
|||||||
|
|
||||||
import static android.os.Build.VERSION.SDK_INT;
|
import static android.os.Build.VERSION.SDK_INT;
|
||||||
import static android.view.Gravity.RIGHT;
|
import static android.view.Gravity.RIGHT;
|
||||||
|
import static android.widget.Toast.LENGTH_LONG;
|
||||||
import static android.widget.Toast.LENGTH_SHORT;
|
import static android.widget.Toast.LENGTH_SHORT;
|
||||||
import static androidx.core.app.ActivityOptionsCompat.makeSceneTransitionAnimation;
|
import static androidx.core.app.ActivityOptionsCompat.makeSceneTransitionAnimation;
|
||||||
import static androidx.lifecycle.Lifecycle.State.STARTED;
|
import static androidx.lifecycle.Lifecycle.State.STARTED;
|
||||||
@@ -774,7 +776,12 @@ public class ConversationActivity extends BriarActivity
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onAttachImageClicked() {
|
public void onAttachImageClicked() {
|
||||||
launcher.launch("image/*");
|
try {
|
||||||
|
launcher.launch("image/*");
|
||||||
|
} catch (ActivityNotFoundException e) {
|
||||||
|
Toast.makeText(this, R.string.error_start_activity,
|
||||||
|
LENGTH_LONG).show();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void onImagesChosen(@Nullable List<Uri> uris) {
|
private void onImagesChosen(@Nullable List<Uri> uris) {
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package org.briarproject.briar.android.removabledrive;
|
package org.briarproject.briar.android.removabledrive;
|
||||||
|
|
||||||
|
import android.content.ActivityNotFoundException;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
@@ -68,9 +69,14 @@ public class ReceiveFragment extends Fragment {
|
|||||||
scrollView = (ScrollView) v;
|
scrollView = (ScrollView) v;
|
||||||
progressBar = v.findViewById(R.id.progressBar);
|
progressBar = v.findViewById(R.id.progressBar);
|
||||||
button = v.findViewById(R.id.fileButton);
|
button = v.findViewById(R.id.fileButton);
|
||||||
button.setOnClickListener(view ->
|
button.setOnClickListener(view -> {
|
||||||
launcher.launch("*/*")
|
try {
|
||||||
);
|
launcher.launch("*/*");
|
||||||
|
} catch (ActivityNotFoundException e) {
|
||||||
|
Toast.makeText(requireContext(),
|
||||||
|
R.string.error_start_activity, LENGTH_LONG).show();
|
||||||
|
}
|
||||||
|
});
|
||||||
viewModel.getOldTaskResumedEvent()
|
viewModel.getOldTaskResumedEvent()
|
||||||
.observeEvent(getViewLifecycleOwner(), this::onOldTaskResumed);
|
.observeEvent(getViewLifecycleOwner(), this::onOldTaskResumed);
|
||||||
viewModel.getState()
|
viewModel.getState()
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package org.briarproject.briar.android.removabledrive;
|
package org.briarproject.briar.android.removabledrive;
|
||||||
|
|
||||||
|
import android.content.ActivityNotFoundException;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
@@ -73,9 +74,14 @@ public class SendFragment extends Fragment {
|
|||||||
introTextView = v.findViewById(R.id.introTextView);
|
introTextView = v.findViewById(R.id.introTextView);
|
||||||
progressBar = v.findViewById(R.id.progressBar);
|
progressBar = v.findViewById(R.id.progressBar);
|
||||||
button = v.findViewById(R.id.fileButton);
|
button = v.findViewById(R.id.fileButton);
|
||||||
button.setOnClickListener(view ->
|
button.setOnClickListener(view -> {
|
||||||
launcher.launch(viewModel.getFileName())
|
try {
|
||||||
);
|
launcher.launch(viewModel.getFileName());
|
||||||
|
} catch (ActivityNotFoundException e) {
|
||||||
|
Toast.makeText(requireContext(),
|
||||||
|
R.string.error_start_activity, LENGTH_LONG).show();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
viewModel.getOldTaskResumedEvent()
|
viewModel.getOldTaskResumedEvent()
|
||||||
.observeEvent(getViewLifecycleOwner(), this::onOldTaskResumed);
|
.observeEvent(getViewLifecycleOwner(), this::onOldTaskResumed);
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
package org.briarproject.briar.android.settings;
|
package org.briarproject.briar.android.settings;
|
||||||
|
|
||||||
|
import android.content.ActivityNotFoundException;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
|
import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
|
||||||
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
|
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
|
||||||
@@ -23,6 +25,7 @@ import androidx.preference.Preference;
|
|||||||
import androidx.preference.PreferenceFragmentCompat;
|
import androidx.preference.PreferenceFragmentCompat;
|
||||||
import androidx.preference.PreferenceGroup;
|
import androidx.preference.PreferenceGroup;
|
||||||
|
|
||||||
|
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.AppModule.getAndroidComponent;
|
import static org.briarproject.briar.android.AppModule.getAndroidComponent;
|
||||||
import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
|
import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
|
||||||
@@ -65,7 +68,12 @@ public class SettingsFragment extends PreferenceFragmentCompat {
|
|||||||
prefAvatar = requireNonNull(findPreference(PREF_KEY_AVATAR));
|
prefAvatar = requireNonNull(findPreference(PREF_KEY_AVATAR));
|
||||||
if (viewModel.shouldEnableProfilePictures()) {
|
if (viewModel.shouldEnableProfilePictures()) {
|
||||||
prefAvatar.setOnPreferenceClickListener(preference -> {
|
prefAvatar.setOnPreferenceClickListener(preference -> {
|
||||||
launcher.launch("image/*");
|
try {
|
||||||
|
launcher.launch("image/*");
|
||||||
|
} catch (ActivityNotFoundException e) {
|
||||||
|
Toast.makeText(requireContext(),
|
||||||
|
R.string.error_start_activity, LENGTH_LONG).show();
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user