Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix text cutoff in device transfer lock dialog.

Browse Source 
Fixes #13040
This commit is contained in:
Cody Henthorne
2023-07-11 19:51:24 -04:00
committed by Clark Chen
parent e06d141823
commit 64415a980f
3 changed files with 14 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferLockedDialog.java
View File

@@ -1,56 +0,0 @@
package org.thoughtcrime.securesms.devicetransfer.olddevice;
import android.app.Dialog;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.FragmentManager;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.net.DeviceTransferBlockingInterceptor;
/**
* Blocking dialog shown on old devices after a successful transfer to prevent use unless
* the user takes action to reactivate.
*/
public final class OldDeviceTransferLockedDialog extends DialogFragment {
private static final String TAG = Log.tag(OldDeviceTransferLockedDialog.class);
private static final String FRAGMENT_TAG = "OldDeviceTransferLockedDialog";
public static void show(@NonNull FragmentManager fragmentManager) {
if (fragmentManager.findFragmentByTag(FRAGMENT_TAG) != null) {
Log.i(TAG, "Locked dialog already being shown");
return;
}
new OldDeviceTransferLockedDialog().show(fragmentManager, FRAGMENT_TAG);
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setCancelable(false);
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
MaterialAlertDialogBuilder dialogBuilder = new MaterialAlertDialogBuilder(requireContext());
dialogBuilder.setView(R.layout.old_device_transfer_locked_dialog_fragment)
.setPositiveButton(R.string.OldDeviceTransferLockedDialog__done, (d, w) -> OldDeviceExitActivity.exit(requireActivity()))
.setNegativeButton(R.string.OldDeviceTransferLockedDialog__cancel_and_activate_this_device, (d, w) -> onUnlockRequest());
return dialogBuilder.create();
}
private void onUnlockRequest() {
SignalStore.misc().clearOldDeviceTransferLocked();
DeviceTransferBlockingInterceptor.getInstance().unblockNetwork();
}
}