Merge pull request #9144 from JosJuice/confirm-runnable-finish

Android: Remove finish from ConfirmRunnableViewHolder
dolphin-emu · Oct 15, 2020 · 16f5a50 · 16f5a50
2 parents ab2e226 + 28b640f
commit 16f5a50
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...oid/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java b/...oid/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java
@@ -331,6 +331,7 @@ public void resetPaths()
     StringSetting.MAIN_RESOURCEPACK_PATH.delete(settings);
     StringSetting.MAIN_SD_PATH.delete(settings);
 
+    notifyItemRangeChanged(0, getItemCount());
     mView.onSettingChanged();
   }
 
@@ -344,6 +345,7 @@ public void setAllLogTypes(boolean value)
               false).setBoolean(settings, value);
     }
 
+    notifyItemRangeChanged(0, getItemCount());
     mView.onSettingChanged();
   }
 

diff --git a/.../org/dolphinemu/dolphinemu/features/settings/ui/viewholder/ConfirmRunnableViewHolder.java b/.../org/dolphinemu/dolphinemu/features/settings/ui/viewholder/ConfirmRunnableViewHolder.java
@@ -73,9 +73,6 @@ public void onClick(View clicked)
                 Toast.makeText(mContext, confirmationText, Toast.LENGTH_SHORT).show();
               }
               dialog.dismiss();
-
-              // TODO: Remove finish and properly update dynamic settings descriptions.
-              mView.getActivity().finish();
             })
             .setNegativeButton("No", (dialog, whichButton) ->
                     dialog.dismiss());