android: fix smb - android 32-bit, crash when all file access declined, simulator in android 11, log keyb in debug mode (#19396)

frontend/drivers/platform_unix.c

@@ -1932,18 +1932,22 @@ static void frontend_unix_get_env(int *argc,
       /* set paths depending on the ability to write
        * to internal_storage_path */
 
-      if (*internal_storage_path)
+      if (*internal_storage_path &&
+         test_permissions(internal_storage_path))
       {
-         if (test_permissions(internal_storage_path))
-            storage_permissions = INTERNAL_STORAGE_WRITABLE;
+         storage_permissions = INTERNAL_STORAGE_WRITABLE;
       }
-      else if (*internal_storage_app_path)
+      else if (*internal_storage_app_path &&
+               test_permissions(internal_storage_app_path))
       {
-         if (test_permissions(internal_storage_app_path))
-            storage_permissions = INTERNAL_STORAGE_APPDIR_WRITABLE;
+         storage_permissions = INTERNAL_STORAGE_APPDIR_WRITABLE;
       }
       else
+      {
+         // fallback to private data storage
+         // e.g. /data/user/0/com.retroarch.aarch64 then saves/ etc.
          storage_permissions = INTERNAL_STORAGE_NOT_WRITABLE;
+      }
 
       /* code to populate default paths*/
       if (*app_dir)

input/drivers/android_input.c

@@ -1374,6 +1374,11 @@ static INLINE void android_input_poll_event_type_key(
    int action   = AKeyEvent_getAction(event);
    int keysym   = keycode;
 
+   int device_id = AInputEvent_getDeviceId(event);
+   RARCH_DBG("android_input_poll_event_type_key: keycode:%d port:%d source:0x%x action:%d device_id:%d is_kbd_id:%d\n",
+      keycode, port, source, action, device_id,
+      android_is_keyboard_id(device_id));
+
    /* Handle 'duplicate' inputs that correspond
     * to the same RETROK_* key */
    switch (keycode)
@@ -1398,7 +1403,10 @@ static INLINE void android_input_poll_event_type_key(
       case AKEY_EVENT_ACTION_DOWN:
          BIT_SET(buf, keysym);
          if (keysym == AKEYCODE_BACK)
+         {
             BIT_SET(buf, AKEYCODE_X);
+            BIT_SET(android_key_state[ANDROID_KEYBOARD_PORT], AKEYCODE_X);
+         }
          break;
    }
 

libretro-common/vfs/vfs_implementation_smb.c

@@ -472,7 +472,7 @@ int64_t retro_vfs_file_read_smb(libretro_vfs_implementation_file *stream,
    struct smb2_context *ctx;
    struct smb2fh *fh;
 
-   if (!smb_initialized || !stream || !s || stream->smb_fh < 0)
+   if (!smb_initialized || !stream || !s || !stream->smb_fh)
       return -1;
 
    if (len == 0)
@@ -519,7 +519,7 @@ int64_t retro_vfs_file_write_smb(libretro_vfs_implementation_file *stream,
    struct smb2_context *ctx;
    struct smb2fh *fh;
 
-   if (!smb_initialized || !stream || !s || stream->smb_fh < 0)
+   if (!smb_initialized || !stream || !s || !stream->smb_fh)
       return -1;
 
    if (len == 0)
@@ -622,7 +622,7 @@ int retro_vfs_file_close_smb(libretro_vfs_implementation_file *stream)
    if (!smb_initialized)
       return -1;
 
-   if (!stream || stream->smb_fh < 0)
+   if (!stream || !stream->smb_fh)
       return -1;
 
    ctx = (struct smb2_context *)(void *)(uintptr_t)stream->smb_ctx;

pkg/android/phoenix/build.gradle

@@ -90,7 +90,7 @@ android {
       targetSdkVersion 36
       versionCode getPlayStoreVersionCode()
       versionName getPlayStoreVersionName()
-  
+
       resValue "string", "app_name", "RetroArch"
       buildConfigField "boolean", "PLAY_STORE_BUILD", "true"
 

pkg/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuActivity.java

@@ -36,9 +36,21 @@ public final class MainMenuActivity extends PreferenceActivity
 
 	public void showMessageOKCancel(String message, DialogInterface.OnClickListener onClickListener)
 	{
-		new AlertDialog.Builder(this).setMessage(message)
-			.setPositiveButton("OK", onClickListener).setCancelable(false)
-			.setNegativeButton("Cancel", null).create().show();
+		new AlertDialog.Builder(this)
+			.setMessage(message)
+			.setPositiveButton("OK", onClickListener)
+			.setCancelable(false)
+			.setNegativeButton("Cancel", new DialogInterface.OnClickListener()
+			{
+				@Override
+				public void onClick(DialogInterface dialog, int which)
+				{
+					checkPermissions = false;
+					finalStartup();
+				}
+			})
+			.create()
+			.show();
 	}
 
 	private boolean addPermission(List<String> permissionsList, String permission)
@@ -79,15 +91,35 @@ public final class MainMenuActivity extends PreferenceActivity
 									Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
 									intent.addCategory("android.intent.category.DEFAULT");
 									intent.setData(Uri.parse(String.format("package:%s", getPackageName())));
+
 									startActivityForResult(intent, REQUEST_CODE_ASK_MULTIPLE_PERMISSIONS);
 								}
-								catch (Exception e)
+								catch (android.content.ActivityNotFoundException e)
 								{
-									Intent intent = new Intent();
-									intent.setAction(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION);
-									startActivityForResult(intent, REQUEST_CODE_ASK_MULTIPLE_PERMISSIONS);
+									try
+									{
+										Intent intent = new Intent(
+											Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION);
+
+										startActivityForResult(
+											intent,
+											REQUEST_CODE_ASK_MULTIPLE_PERMISSIONS);
+									}
+									catch (android.content.ActivityNotFoundException e2)
+									{
+										Log.w("MainMenuActivity",
+											"All files access settings are not available on this device.");
+										// The device does not provide an all files access
+										checkPermissions = false;
+										finalStartup();
+									}
 								}
 							}
+							else
+							{
+								/* User rejected all files access - data written to private storage */
+								finalStartup();
+							}
 						}
 					});
 			}
@@ -150,22 +182,6 @@ public final class MainMenuActivity extends PreferenceActivity
 		}
 	}
 
-	@Override
-	protected void onResume()
-	{
-		super.onResume();
-
-		// If the user just came back from settings and granted the permission, boot immediately
-		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R)
-		{
-			if (Environment.isExternalStorageManager() && checkPermissions)
-			{
-				checkPermissions = false;
-				finalStartup();
-			}
-		}
-	}
-
 	public void finalStartup()
 	{
 		Intent retro = new Intent(this, RetroActivityFuture.class);
@@ -296,4 +312,16 @@ public final class MainMenuActivity extends PreferenceActivity
 		else
 			checkRuntimePermissions();
 	}
+
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data)
+	{
+		super.onActivityResult(requestCode, resultCode, data);
+
+		if (requestCode == REQUEST_CODE_ASK_MULTIPLE_PERMISSIONS)
+		{
+			checkPermissions = false;
+			finalStartup();
+		}
+	}
 }