empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Renamed EnterCodeFragment to EnterSmsCodeFragment.

Browse source 
I could never find the darn thing.
This commit is contained in:
Greyson Parrelli 2021-10-12 15:44:56 -04:00
parent a7af687f8e
commit 22d6546704
6 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterCodeFragment.kt → app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterSmsCodeFragment.kt
View file

@ -10,9 +10,9 @@ import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNum
import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.getCaptchaArguments
import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.getViewModel
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.registration.fragments.BaseEnterCodeFragment
import org.thoughtcrime.securesms.registration.fragments.BaseEnterSmsCodeFragment
class ChangeNumberEnterCodeFragment : BaseEnterCodeFragment<ChangeNumberViewModel>(R.layout.fragment_change_number_enter_code) {
class ChangeNumberEnterSmsCodeFragment : BaseEnterSmsCodeFragment<ChangeNumberViewModel>(R.layout.fragment_change_number_enter_code) {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
@ -54,10 +54,10 @@ class ChangeNumberEnterCodeFragment : BaseEnterCodeFragment<ChangeNumberViewMode
}
override fun navigateToRegistrationLock(timeRemaining: Long) {
findNavController().navigate(ChangeNumberEnterCodeFragmentDirections.actionChangeNumberEnterCodeFragmentToChangeNumberRegistrationLock(timeRemaining))
findNavController().navigate(ChangeNumberEnterSmsCodeFragmentDirections.actionChangeNumberEnterCodeFragmentToChangeNumberRegistrationLock(timeRemaining))
}
override fun navigateToKbsAccountLocked() {
findNavController().navigate(ChangeNumberEnterCodeFragmentDirections.actionChangeNumberEnterCodeFragmentToChangeNumberAccountLocked())
findNavController().navigate(ChangeNumberEnterSmsCodeFragmentDirections.actionChangeNumberEnterCodeFragmentToChangeNumberAccountLocked())
}
}

6
app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseEnterCodeFragment.java → app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseEnterSmsCodeFragment.java
View file

@ -50,9 +50,9 @@ import io.reactivex.rxjava3.disposables.Disposable;
*
* @param <ViewModel> - The concrete view model used by the subclasses, for ease of access in said subclass
*/
public abstract class BaseEnterCodeFragment<ViewModel extends BaseRegistrationViewModel> extends LoggingFragment implements SignalStrengthPhoneStateListener.Callback {
public abstract class BaseEnterSmsCodeFragment<ViewModel extends BaseRegistrationViewModel> extends LoggingFragment implements SignalStrengthPhoneStateListener.Callback {
private static final String TAG = Log.tag(BaseEnterCodeFragment.class);
private static final String TAG = Log.tag(BaseEnterSmsCodeFragment.class);
private ScrollView scrollView;
private TextView header;
@ -68,7 +68,7 @@ public abstract class BaseEnterCodeFragment<ViewModel extends BaseRegistrationVi
protected final LifecycleDisposable disposables = new LifecycleDisposable();
public BaseEnterCodeFragment(@LayoutRes int contentLayoutId) {
public BaseEnterSmsCodeFragment(@LayoutRes int contentLayoutId) {
super(contentLayoutId);
}

12
app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterCodeFragment.java → app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterSmsCodeFragment.java
View file

@ -13,11 +13,11 @@ import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
import java.io.IOException;
public final class EnterCodeFragment extends BaseEnterCodeFragment<RegistrationViewModel> implements SignalStrengthPhoneStateListener.Callback {
public final class EnterSmsCodeFragment extends BaseEnterSmsCodeFragment<RegistrationViewModel> implements SignalStrengthPhoneStateListener.Callback {
private static final String TAG = Log.tag(EnterCodeFragment.class);
private static final String TAG = Log.tag(EnterSmsCodeFragment.class);
public EnterCodeFragment() {
public EnterSmsCodeFragment() {
super(R.layout.fragment_registration_enter_code);
}
@ -37,18 +37,18 @@ public final class EnterCodeFragment extends BaseEnterCodeFragment<RegistrationV
Log.w(TAG, "Failed to refresh flags after " + (System.currentTimeMillis() - startTime) + " ms.", e);
}
return null;
}, none -> displaySuccess(() -> Navigation.findNavController(requireView()).navigate(EnterCodeFragmentDirections.actionSuccessfulRegistration())));
}, none -> displaySuccess(() -> Navigation.findNavController(requireView()).navigate(EnterSmsCodeFragmentDirections.actionSuccessfulRegistration())));
}
@Override
protected void navigateToRegistrationLock(long timeRemaining) {
Navigation.findNavController(requireView())
.navigate(EnterCodeFragmentDirections.actionRequireKbsLockPin(timeRemaining));
.navigate(EnterSmsCodeFragmentDirections.actionRequireKbsLockPin(timeRemaining));
}
@Override
protected void navigateToCaptcha() {
NavHostFragment.findNavController(this).navigate(EnterCodeFragmentDirections.actionRequestCaptcha());
NavHostFragment.findNavController(this).navigate(EnterSmsCodeFragmentDirections.actionRequestCaptcha());
}
@Override

4
app/src/main/res/layout/fragment_registration_enter_code.xml
View file

@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".registration.fragments.EnterCodeFragment">
tools:context=".registration.fragments.EnterSmsCodeFragment">
<ScrollView
android:id="@+id/scroll_view"
@ -17,7 +17,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:context=".registration.fragments.EnterCodeFragment">
tools:context=".registration.fragments.EnterSmsCodeFragment">
<Button
android:id="@+id/wrong_number"

2
app/src/main/res/navigation/app_settings_change_number.xml
View file

@ -98,7 +98,7 @@
<fragment
android:id="@+id/changeNumberEnterCodeFragment"
android:name="org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberEnterCodeFragment"
android:name="org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberEnterSmsCodeFragment"
tools:layout="@layout/fragment_change_number_enter_code">
<action

2
app/src/main/res/navigation/registration.xml
View file

@ -120,7 +120,7 @@
<fragment
android:id="@+id/enterCodeFragment"
android:name="org.thoughtcrime.securesms.registration.fragments.EnterCodeFragment"
android:name="org.thoughtcrime.securesms.registration.fragments.EnterSmsCodeFragment"
android:label="fragment_enter_code"
tools:layout="@layout/fragment_registration_enter_code">