Skip to content

Commit 76f1e58

Browse files
TacoTheDankStypox
authored andcommitted
Utilize BundleCompat and IntentCompat methods
1 parent f3b458c commit 76f1e58

4 files changed

Lines changed: 9 additions & 4 deletions

File tree

app/src/main/java/org/schabi/newpipe/error/ErrorActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import androidx.appcompat.app.ActionBar;
1818
import androidx.appcompat.app.AlertDialog;
1919
import androidx.appcompat.app.AppCompatActivity;
20+
import androidx.core.content.IntentCompat;
2021

2122
import com.grack.nanojson.JsonWriter;
2223

@@ -105,7 +106,7 @@ protected void onCreate(final Bundle savedInstanceState) {
105106
actionBar.setDisplayShowTitleEnabled(true);
106107
}
107108

108-
errorInfo = intent.getParcelableExtra(ERROR_INFO);
109+
errorInfo = IntentCompat.getParcelableExtra(intent, ERROR_INFO, ErrorInfo.class);
109110

110111
// important add guru meditation
111112
addGuruMeditation();

app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsExportService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import android.net.Uri;
2626
import android.util.Log;
2727

28+
import androidx.core.content.IntentCompat;
2829
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
2930

3031
import org.reactivestreams.Subscriber;
@@ -65,7 +66,7 @@ public int onStartCommand(final Intent intent, final int flags, final int startI
6566
return START_NOT_STICKY;
6667
}
6768

68-
final Uri path = intent.getParcelableExtra(KEY_FILE_PATH);
69+
final Uri path = IntentCompat.getParcelableExtra(intent, KEY_FILE_PATH, Uri.class);
6970
if (path == null) {
7071
stopAndReportError(new IllegalStateException(
7172
"Exporting to a file, but the path is null"),

app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
import androidx.annotation.NonNull;
3232
import androidx.annotation.Nullable;
33+
import androidx.core.content.IntentCompat;
3334
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
3435

3536
import org.reactivestreams.Subscriber;
@@ -108,7 +109,7 @@ public int onStartCommand(final Intent intent, final int flags, final int startI
108109
if (currentMode == CHANNEL_URL_MODE) {
109110
channelUrl = intent.getStringExtra(KEY_VALUE);
110111
} else {
111-
final Uri uri = intent.getParcelableExtra(KEY_VALUE);
112+
final Uri uri = IntentCompat.getParcelableExtra(intent, KEY_VALUE, Uri.class);
112113
if (uri == null) {
113114
stopAndReportError(new IllegalStateException(
114115
"Importing from input stream, but file path is null"),

app/src/main/java/org/schabi/newpipe/util/StateSaver.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
import androidx.annotation.NonNull;
2929
import androidx.annotation.Nullable;
30+
import androidx.core.os.BundleCompat;
3031

3132
import org.schabi.newpipe.BuildConfig;
3233
import org.schabi.newpipe.MainActivity;
@@ -82,7 +83,8 @@ public static SavedState tryToRestore(final Bundle outState, final WriteRead wri
8283
return null;
8384
}
8485

85-
final SavedState savedState = outState.getParcelable(KEY_SAVED_STATE);
86+
final SavedState savedState = BundleCompat.getParcelable(
87+
outState, KEY_SAVED_STATE, SavedState.class);
8688
if (savedState == null) {
8789
return null;
8890
}

0 commit comments

Comments
 (0)