Fixed crashing of storage app (#1431)

Author: maneesht

storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage/java/MainActivity.java

@@ -64,6 +64,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 
     private ActivityMainBinding binding;
 
+    private ActivityResultLauncher<String[]> intentLauncher;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -85,6 +87,15 @@ protected void onCreate(Bundle savedInstanceState) {
         }
         onNewIntent(getIntent());
 
+        intentLauncher = registerForActivityResult(
+                new ActivityResultContracts.OpenDocument(), fileUri -> {
+                    if (fileUri != null) {
+                        uploadFromUri(fileUri);
+                    } else {
+                        Log.w(TAG, "File URI is null");
+                    }
+                });
+
         // Local broadcast receiver
         mBroadcastReceiver = new BroadcastReceiver() {
             @Override
@@ -193,14 +204,6 @@ private void launchCamera() {
         Log.d(TAG, "launchCamera");
 
         // Pick an image from storage
-        ActivityResultLauncher<String[]> intentLauncher = registerForActivityResult(
-                new ActivityResultContracts.OpenDocument(), fileUri -> {
-                    if (fileUri != null) {
-                        uploadFromUri(fileUri);
-                    } else {
-                        Log.w(TAG, "File URI is null");
-                    }
-                });
         intentLauncher.launch(new String[]{ "image/*" });
     }
 

storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage/java/MyBaseTaskService.java

@@ -86,8 +86,9 @@ protected void showProgressNotification(String caption, long completedUnits, lon
      */
     protected void showFinishedNotification(String caption, Intent intent, boolean success) {
         // Make PendingIntent for notification
+        int flag = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_IMMUTABLE : PendingIntent.FLAG_UPDATE_CURRENT;
         PendingIntent pendingIntent = PendingIntent.getActivity(this, 0 /* requestCode */, intent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
+                flag);
 
         int icon = success ? R.drawable.ic_check_white_24 : R.drawable.ic_error_white_24dp;
 

storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage/kotlin/MainActivity.kt

@@ -9,6 +9,7 @@ import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
@@ -37,6 +38,8 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
 
     private lateinit var binding: ActivityMainBinding
 
+    private lateinit var cameraIntent: ActivityResultLauncher<Array<String>>;
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
@@ -52,6 +55,14 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
             buttonDownload.setOnClickListener(this@MainActivity)
         }
 
+        cameraIntent = registerForActivityResult(ActivityResultContracts.OpenDocument()) { fileUri ->
+            if (fileUri != null) {
+                uploadFromUri(fileUri)
+            } else {
+                Log.w(TAG, "File URI is null")
+            }
+        }
+
         // Local broadcast receiver
         broadcastReceiver = object : BroadcastReceiver() {
             override fun onReceive(context: Context, intent: Intent) {
@@ -159,14 +170,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
         Log.d(TAG, "launchCamera")
 
         // Pick an image from storage
-        val intentLauncher = registerForActivityResult(ActivityResultContracts.OpenDocument()) { fileUri ->
-            if (fileUri != null) {
-                uploadFromUri(fileUri)
-            } else {
-                Log.w(TAG, "File URI is null")
-            }
-        }
-        intentLauncher.launch(arrayOf("image/*"))
+        cameraIntent.launch(arrayOf("image/*"))
     }
 
     private fun signInAnonymously() {

storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage/kotlin/MyBaseTaskService.kt

@@ -7,8 +7,8 @@ import android.app.Service
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import androidx.core.app.NotificationCompat
 import android.util.Log
+import androidx.core.app.NotificationCompat
 import com.google.firebase.quickstart.firebasestorage.R
 
 /**
@@ -79,8 +79,12 @@ abstract class MyBaseTaskService : Service() {
      */
     protected fun showFinishedNotification(caption: String, intent: Intent, success: Boolean) {
         // Make PendingIntent for notification
+
+        // Make PendingIntent for notification
+        val flag = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
+            PendingIntent.FLAG_IMMUTABLE else PendingIntent.FLAG_UPDATE_CURRENT
         val pendingIntent = PendingIntent.getActivity(this, 0 /* requestCode */, intent,
-                PendingIntent.FLAG_UPDATE_CURRENT)
+                flag)
 
         val icon = if (success) R.drawable.ic_check_white_24 else R.drawable.ic_error_white_24dp
 

storage/gradle.properties

@@ -10,6 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
+android.useAndroidX=true
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit