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

Allow choose backup restore flow to work on pre-API29 devices.

Browse Source
This commit is contained in:
Cody Henthorne
2021-03-17 11:44:46 -04:00
committed by Greyson Parrelli
parent 9366596f5f
commit 5d96bc2d3a
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ import android.graphics.Canvas;
import android.graphics.Paint;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.text.Editable;
import android.text.Spanned;
@@ -108,7 +109,7 @@ public final class RestoreBackupFragment extends BaseRegistrationFragment {
}
RestoreBackupFragmentArgs args = RestoreBackupFragmentArgs.fromBundle(requireArguments());
if (BackupUtil.isUserSelectionRequired(requireContext()) && args.getUri() != null) {
if ((Build.VERSION.SDK_INT < 29 || BackupUtil.isUserSelectionRequired(requireContext())) && args.getUri() != null) {
Log.i(TAG, "Restoring backup from passed uri");
initializeBackupForUri(view, args.getUri());
@@ -142,7 +143,6 @@ public final class RestoreBackupFragment extends BaseRegistrationFragment {
}
}
@RequiresApi(29)
private void initializeBackupForUri(@NonNull View view, @NonNull Uri uri) {
getFromUri(requireContext(), uri, backup -> handleBackupInfo(view, backup));
}
@@ -197,7 +197,6 @@ public final class RestoreBackupFragment extends BaseRegistrationFragment {
}.execute();
}
@RequiresApi(29)
static void getFromUri(@NonNull Context context,
@NonNull Uri backupUri,
@NonNull OnBackupSearchResultListener listener)