Restore instance data in ImportConfirmationDialog before checking the data

Yevhen Babiichuk (DustDFG) · siddhesh-06 · Yevhen Babiichuk (DustDFG) · commit a40b42b785b9 · 2026-01-04T23:27:11.000+02:00
Prevents crash on check of uninitialized data after screen rotation

Co-authored-by: Siddhesh Dhainje &lt;siddheshdhainje2001@gmail.com&gt;
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/ImportConfirmationDialog.java b/app/src/main/java/org/schabi/newpipe/local/subscription/ImportConfirmationDialog.java
@@ -49,12 +49,10 @@ public Dialog onCreateDialog(@Nullable final Bundle savedInstanceState) {
     @Override
     public void onCreate(@Nullable final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
+        Bridge.restoreInstanceState(this, savedInstanceState);
         if (resultServiceIntent == null) {
             throw new IllegalStateException("Result intent is null");
         }
-
-        Bridge.restoreInstanceState(this, savedInstanceState);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -49,12 +49,10 @@ public Dialog onCreateDialog(@Nullable final Bundle savedInstanceState) {`
`49`	`49`	`@Override`
`50`	`50`	`public void onCreate(@Nullable final Bundle savedInstanceState) {`
`51`	`51`	`super.onCreate(savedInstanceState);`
`52`		`-`
	`52`	`+ Bridge.restoreInstanceState(this, savedInstanceState);`
`53`	`53`	`if (resultServiceIntent == null) {`
`54`	`54`	`throw new IllegalStateException("Result intent is null");`
`55`	`55`	`}`
`56`		`-`
`57`		`- Bridge.restoreInstanceState(this, savedInstanceState);`
`58`	`56`	`}`
`59`	`57`
`60`	`58`	`@Override`