Merge pull request #803 from leminlimez/v7-more-bubfix

V7 more bubfix

Author: leminlimez

devicemanagement/device_manager.py

@@ -83,7 +83,7 @@ def show_apply_error(e: Exception, update_label=lambda x: None, files_list: list
         return ApplyAlertMessage(QCoreApplication.tr("You must run the application as an administer to use BookRestore tweaks."), detailed_txt="Try running the program with sudo.")
     elif isinstance(e, InvalidServiceError):
         return ApplyAlertMessage(QCoreApplication.tr("You must enable developer mode on your device. You can do it in the Settings app."),
-                                 detailed_txt=QCoreApplication.tr("BookRestore tweaks require developer mode to apply. You can enable this at the bottom of the Settings app on your iPhone or iPad."))
+                                 detailed_txt=QCoreApplication.tr("BookRestore tweaks with the AFC method require developer mode to apply.\n\nYou can enable this at the bottom of Settings > Privacy & Security > Developer Mode on your iPhone or iPad."))
     elif isinstance(e, NuggetException):
         return ApplyAlertMessage(str(e), detailed_txt=e.detailed_text)
     else:
@@ -530,7 +530,7 @@ def apply_changes(self, update_label=lambda x: None, show_alert=lambda x: None):
                     basic_plists = tweak.apply_tweak(basic_plists, self.allow_risky_tweaks)
                     basic_plists_ownership[tweak.file_location] = tweak.owner
                     if tweak.enabled and isinstance(tweak, RdarFixTweak) and Version(self.get_current_device_version()) >= Version("26.0"):
-                        uses_domains = True
+                        use_bookrestore = True
                 elif isinstance(tweak, NullifyFileTweak):
                     tweak.apply_tweak(files_data)
                     if tweak.enabled and tweak.file_location.value.startswith("/var/mobile/"):
@@ -545,7 +545,7 @@ def apply_changes(self, update_label=lambda x: None, show_alert=lambda x: None):
                     )
                     if tweak.uses_domains():
                         uses_domains = True
-                    else:
+                    elif not tweak.is_empty():
                         use_bookrestore = True
                 elif isinstance(tweak, StatusBarTweak):
                     tweak.apply_tweak(files_to_restore=files_to_restore)

gui/main_window.py

@@ -19,7 +19,7 @@
 
 from tweaks.tweaks import tweaks, TweakID
 
-App_Version = "7.0.1"
+App_Version = "7.0.2"
 App_Build = 0
 
 class MainWindow(QtWidgets.QMainWindow):
@@ -149,6 +149,11 @@ def refresh_devices_finished(self):
         # clear the picker
         self.ui.devicePicker.clear()
         self.ui.restoreProgressBar.hide()
+        self.pages[Page.Settings].set_risky_options_visible(
+            visible=self.device_manager.allow_risky_tweaks,
+            device_connected=(len(self.device_manager.devices) > 0)
+        )
+
         if len(self.device_manager.devices) == 0:
             self.ui.devicePicker.setEnabled(False)
             self.ui.devicePicker.addItem(self.noneText)
@@ -199,19 +204,6 @@ def refresh_devices_finished(self):
             self.ui.templatesPageBtn.show()
             self.ui.posterboardPageBtn.show()
             self.ui.miscOptionsBtn.show()
-
-            if self.device_manager.allow_risky_tweaks:
-                try:
-                    self.ui.resetPBDrp.removeItem(4)
-                except:
-                    pass
-                self.ui.resetPBDrp.addItem("PB Extensions", "PB Extensions")
-            else:
-                self.ui.advancedPageBtn.hide()
-                try:
-                    self.ui.resetPBDrp.removeItem(4)
-                except:
-                    pass
 
             self.ui.sidebarDiv2.show()
             self.ui.applyPageBtn.show()
@@ -309,8 +301,6 @@ def change_selected_device(self, index):
                 self.ui.advancedPageBtn.show()
             else:
                 self.ui.advancedPageBtn.hide()
-            # toggle AtWakeUp checkbox with risky tweaks
-            self.ui.atwakeupChk.setVisible(self.device_manager.allow_risky_tweaks)
 
             # hide the ai content if not on
             if device_ver >= Version("18.1") and (not TweakID.AIGestalt in tweaks or not tweaks[TweakID.AIGestalt].enabled):
@@ -402,14 +392,6 @@ def loadSettings(self):
             else:
                 self.ui.skipSetupOnLbl.hide()
 
-            # hide/show the frame limit
-            if risky_tweaks:
-                self.ui.ignorePBFrameLimitChk.show()
-                self.ui.disableTendiesLimitChk.show()
-            else:
-                self.ui.ignorePBFrameLimitChk.hide()
-                self.ui.disableTendiesLimitChk.hide()
-
             self.device_manager.apply_over_wifi = apply_over_wifi
             self.device_manager.auto_reboot = auto_reboot
             self.device_manager.allow_risky_tweaks = risky_tweaks

gui/pages/main/settings.py

@@ -82,6 +82,21 @@ def load_available_languages(self):
             idx = 0
         self.ui.langDrp.setCurrentIndex(idx)
 
+    # Toggle the risky options visibility
+    def set_risky_options_visible(self, visible: bool, device_connected: bool=True):
+        if device_connected:
+            self.ui.advancedPageBtn.setVisible(visible)
+        self.ui.ignorePBFrameLimitChk.setVisible(visible)
+        self.ui.disableTendiesLimitChk.setVisible(visible)
+        self.ui.atwakeupChk.setVisible(visible)
+        self.ui.enableiPadOSChk.setVisible(visible)
+        try:
+            self.ui.resetPBDrp.removeItem(4)
+        except:
+            pass
+        if visible:
+            self.ui.resetPBDrp.addItem("PB Extensions")
+
     ## ACTIONS
     def on_langDrp_activated(self, index: int):
         new_lang = self.lang_indexes[index]
@@ -96,17 +111,7 @@ def on_showRiskyChk_toggled(self, checked: bool):
         self.window.device_manager.allow_risky_tweaks = checked
         # save the setting
         self.window.settings.setValue("show_risky_tweaks", checked)
-        # toggle the button visibilities
-        self.ui.advancedPageBtn.setVisible(checked)
-        self.ui.ignorePBFrameLimitChk.setVisible(checked)
-        self.ui.disableTendiesLimitChk.setVisible(checked)
-        self.ui.atwakeupChk.setVisible(checked)
-        try:
-            self.ui.resetPBDrp.removeItem(4)
-        except:
-            pass
-        if checked:
-            self.ui.resetPBDrp.addItem("PB Extensions")
+        self.set_risky_options_visible(checked)
     def on_ignorePBFrameLimitChk_toggled(self, checked: bool):
         set_ignore_frame_limit(checked)
         # save the setting

restore/bookrestore.py

@@ -399,8 +399,9 @@ def perform_bookrestore(files: list[FileToRestore], lockdown_client: LockdownCli
     if not lockdown_client.developer_mode_status:
         # enable developer mode
         progress_callback("Enabling Developer Mode...")
-        AmfiService(lockdown=lockdown_client).enable_developer_mode()
-        raise NuggetException("Developer Mode Enabled. Please refresh the device list after reboot and apply again.")
+        AmfiService(lockdown=lockdown_client).reveal_developer_mode_option_in_ui()
+        raise NuggetException("You must enable developer mode on your device. You can do it in the Settings app.\n\nClick \"Show Details\" for more information.",
+                              detailed_text="BookRestore tweaks with the AFC method require developer mode to apply.\n\nYou can enable this at the bottom of Settings > Privacy & Security > Developer Mode on your iPhone or iPad.")
     if os.name == 'nt':
         asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
     asyncio.run(create_connection_context(files, lockdown_client, current_device_books_uuid_callback, progress_callback, transfer_mode))

tweaks/posterboard/posterboard_tweak.py

@@ -34,6 +34,9 @@ def __init__(self):
 
     def uses_domains(self):
         return (len(self.tendies) > 0 or self.videoFile != None or len(self.resetModes) > 0)
+    
+    def is_empty(self) -> bool:
+        return not self.uses_domains()
 
     def verify_tendie(self, new_tendie: TendieFile, is_template: bool = False) -> bool:
         if new_tendie.descriptor_cnt + self.get_descriptor_count() <= 10:

tweaks/posterboard/template_options/templates_tweak.py

@@ -23,6 +23,9 @@ def uses_domains(self):
                 return True
         return False
 
+    def is_empty(self) -> bool:
+        return len(self.templates) == 0
+
     def add_template(self, file: str, version: str = None):
         try:
             new_template = TemplateFile(path=file, device_version=version)