Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 18:30:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade several AndroidX Libraries.

Browse Source 
AppCompat 1.2.0 to 1.5.1
Lifecycle 2.3.1 to 2.5.1
Navigation 2.3.5 to 2.5.2
Fragment 1.3.5 to 1.5.2
Annotations 1.2.0 to 1.4.0
Window 1.0.0-alpha09 to 1.0.0
AAPT2 to 7.0.4
Fragment-Testing 1.3.5 to 1.5.2 (matching Fragment)
This commit is contained in:
Alex Hart
2022-09-13 11:16:01 -03:00
committed by Greyson Parrelli
parent 9331e9ce89
commit 26bebb9811
86 changed files with 1398 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/registration/fragments/CaptchaFragment.java
View File

@@ -10,7 +10,7 @@ import android.webkit.WebViewClient;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.ViewModelProviders;
import androidx.lifecycle.ViewModelProvider;
import androidx.navigation.fragment.NavHostFragment;
import org.thoughtcrime.securesms.BuildConfig;
@@ -64,7 +64,8 @@ public final class CaptchaFragment extends LoggingFragment {
}
if (provider == null) {
viewModel = ViewModelProviders.of(requireActivity()).get(RegistrationViewModel.class);
viewModel = new ViewModelProvider(
requireActivity()).get(RegistrationViewModel.class);
} else {
viewModel = provider.get(this);
}

2
app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ChooseBackupFragment.java
View File

@@ -15,7 +15,6 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.core.text.HtmlCompat;
import androidx.navigation.Navigation;
@@ -60,7 +59,6 @@ public class ChooseBackupFragment extends LoggingFragment {
}
}
@RequiresApi(21)
private void onChooseBackupSelected(@NonNull View view) {
Intent intent = new Intent(Intent.ACTION_GET_CONTENT);

4
app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterSmsCodeFragment.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.registration.fragments;
import androidx.annotation.NonNull;
import androidx.lifecycle.ViewModelProviders;
import androidx.lifecycle.ViewModelProvider;
import androidx.navigation.Navigation;
import androidx.navigation.fragment.NavHostFragment;
@@ -24,7 +24,7 @@ public final class EnterSmsCodeFragment extends BaseEnterSmsCodeFragment<Registr
@Override
protected @NonNull RegistrationViewModel getViewModel() {
return ViewModelProviders.of(requireActivity()).get(RegistrationViewModel.class);
return new ViewModelProvider(requireActivity()).get(RegistrationViewModel.class);
}
@Override

4
app/src/main/java/org/thoughtcrime/securesms/registration/fragments/WelcomeFragment.java
View File

@@ -17,7 +17,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.annotation.StringRes;
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.ViewModelProviders;
import androidx.lifecycle.ViewModelProvider;
import androidx.navigation.ActivityNavigator;
import androidx.navigation.Navigation;
import androidx.navigation.fragment.NavHostFragment;
@@ -84,7 +84,7 @@ public final class WelcomeFragment extends LoggingFragment {
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
viewModel = ViewModelProviders.of(requireActivity()).get(RegistrationViewModel.class);
viewModel = new ViewModelProvider(requireActivity()).get(RegistrationViewModel.class);
if (viewModel.isReregister()) {
if (viewModel.hasRestoreFlowBeenShown()) {