GitHub migration (#220)

* removed "Email the Developer", changed the forum link to GitHub, updated Credits * Removed FeedbackManager * Cleanup * Writing .nc_sensitive.h when building nightly
mikekazakov · Apr 20, 2024 · 02a91f5 · 02a91f5
1 parent 484427a
commit 02a91f5
Show file tree

Hide file tree

Showing 22 changed files with 69 additions and 1,474 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -29,6 +29,7 @@ jobs:
         NOTARIZATION_APPLE_ID: ${{ secrets.NOTARIZATION_APPLE_ID }}
         NOTARIZATION_PWD: ${{ secrets.NOTARIZATION_PWD }}
         NOTARIZATION_TEAM: ${{ secrets.NOTARIZATION_TEAM }}
+        NC_SENSITIVE: ${{ secrets.NC_SENSITIVE }}
       run: |
         # create variables
         CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
@@ -50,7 +51,9 @@ jobs:
         # store notatization credentials
         xcrun notarytool store-credentials AC_PASSWORD --apple-id $NOTARIZATION_APPLE_ID --team-id $NOTARIZATION_TEAM --password $NOTARIZATION_PWD
     - name: Build and package
-      run: "cd Scripts && ./build_nightly.sh"
+      run: |
+        echo -n "$NC_SENSITIVE" | base64 --decode -o /Users/runner/.nc_sensitive.h
+        cd Scripts && ./build_nightly.sh
     - name: Clean up keychain and provisioning profile
       if: ${{ always() }}
       run: |

diff --git a/Source/NimbleCommander/NimbleCommander.xcodeproj/project.pbxproj b/Source/NimbleCommander/NimbleCommander.xcodeproj/project.pbxproj
diff --git a/Source/NimbleCommander/NimbleCommander/Bootstrap/AppDelegate+MainWindowCreation.mm b/Source/NimbleCommander/NimbleCommander/Bootstrap/AppDelegate+MainWindowCreation.mm
@@ -194,8 +194,7 @@ - (MainWindowFilePanelState *)allocateFilePanelsWithFrame:(NSRect)_frame
                                             loadDefaultContent:true
                                                   panelFactory:PanelFactory
                                     controllerStateJSONDecoder:ctrl_state_json_decoder
-                                                QLPanelAdaptor:self.QLPanelAdaptor
-                                               feedbackManager:self.feedbackManager];
+                                                QLPanelAdaptor:self.QLPanelAdaptor];
     }
     else if( _context == CreationContext::ManualRestoration ) {
         if( NCMainWindowController.canRestoreDefaultWindowStateFromLastOpenedWindow ) {
@@ -204,8 +203,7 @@ - (MainWindowFilePanelState *)allocateFilePanelsWithFrame:(NSRect)_frame
                                                       loadDefaultContent:false
                                                             panelFactory:PanelFactory
                                               controllerStateJSONDecoder:ctrl_state_json_decoder
-                                                          QLPanelAdaptor:self.QLPanelAdaptor
-                                                         feedbackManager:self.feedbackManager];
+                                                          QLPanelAdaptor:self.QLPanelAdaptor];
             RestoreFilePanelStateFromLastOpenedWindow(state);
             [state loadDefaultPanelContent];
             return state;
@@ -216,8 +214,7 @@ - (MainWindowFilePanelState *)allocateFilePanelsWithFrame:(NSRect)_frame
                                                       loadDefaultContent:false
                                                             panelFactory:PanelFactory
                                               controllerStateJSONDecoder:ctrl_state_json_decoder
-                                                          QLPanelAdaptor:self.QLPanelAdaptor
-                                                         feedbackManager:self.feedbackManager];
+                                                          QLPanelAdaptor:self.QLPanelAdaptor];
             if( ![NCMainWindowController restoreDefaultWindowStateFromConfig:state] )
                 [state loadDefaultPanelContent];
             return state;
@@ -234,8 +231,7 @@ - (MainWindowFilePanelState *)allocateFilePanelsWithFrame:(NSRect)_frame
                                             loadDefaultContent:false
                                                   panelFactory:PanelFactory
                                     controllerStateJSONDecoder:ctrl_state_json_decoder
-                                                QLPanelAdaptor:self.QLPanelAdaptor
-                                               feedbackManager:self.feedbackManager];
+                                                QLPanelAdaptor:self.QLPanelAdaptor];
     }
     return nil;
 }

diff --git a/Source/NimbleCommander/NimbleCommander/Bootstrap/AppDelegate.h b/Source/NimbleCommander/NimbleCommander/Bootstrap/AppDelegate.h
@@ -8,13 +8,11 @@
 @class NCConfigObjCBridge;
 @class NCMainWindowController;
 @class InternalViewerWindowController;
-@class AppStoreHelper;
 class ExternalEditorsStorage;
 class NetworkConnectionsManager;
 
 namespace nc {
 
-class FeedbackManager;
 class ThemesManager;
 
 namespace config {
@@ -121,8 +119,6 @@ class NativeHost;
 @property(nonatomic, readonly)
     const std::shared_ptr<NetworkConnectionsManager> &networkConnectionsManager;
 
-@property(nonatomic, readonly) AppStoreHelper *appStoreHelper;
-
 @property(nonatomic, readonly) nc::ops::AggregateProgressTracker &operationsProgressTracker;
 
 @property(nonatomic, readonly)
@@ -144,8 +140,6 @@ class NativeHost;
 
 @property(nonatomic, readonly) const std::shared_ptr<nc::vfs::NativeHost> &nativeHostPtr;
 
-@property(nonatomic, readonly) nc::FeedbackManager &feedbackManager;
-
 @property(nonatomic, readonly) nc::utility::FSEventsFileUpdate &fsEventsFileUpdate;
 
 @property(nonatomic, readonly) nc::ops::PoolEnqueueFilter &poolEnqueueFilter;

diff --git a/Source/NimbleCommander/NimbleCommander/Bootstrap/AppDelegate.mm b/Source/NimbleCommander/NimbleCommander/Bootstrap/AppDelegate.mm
@@ -42,7 +42,6 @@
 
 #include <NimbleCommander/Core/ActionsShortcutsManager.h>
 #include <NimbleCommander/Core/SandboxManager.h>
-#include <NimbleCommander/Core/FeedbackManagerImpl.h>
 #include <NimbleCommander/Core/Dock.h>
 #include <NimbleCommander/Core/ServicesHandler.h>
 #include <NimbleCommander/Core/ConfigBackedNetworkConnectionsManager.h>
@@ -230,7 +229,6 @@ @implementation NCAppDelegate {
     std::string m_ConfigDirectory;
     std::string m_StateDirectory;
     std::vector<nc::config::Token> m_ConfigObservationTickets;
-    AppStoreHelper *m_AppStoreHelper;
     upward_flag m_FinishedLaunching;
     std::shared_ptr<nc::panel::FavoriteLocationsStorageImpl> m_Favorites;
     NSMutableArray *m_FilesToOpen;
@@ -249,7 +247,6 @@ @implementation NCAppDelegate {
 @synthesize configDirectory = m_ConfigDirectory;
 @synthesize stateDirectory = m_StateDirectory;
 @synthesize supportDirectory = m_SupportDirectory;
-@synthesize appStoreHelper = m_AppStoreHelper;
 @synthesize recentlyClosedMenu;
 
 - (id)init
@@ -281,8 +278,6 @@ - (void)applicationWillFinishLaunching:(NSNotification *) [[maybe_unused]] _noti
 {
     RegisterAvailableVFS();
 
-    [self feedbackManager];
-
     // Init themes manager
     m_ThemesManager = std::make_unique<nc::ThemesManager>(GlobalConfig(), g_ConfigSelectedTheme, g_ConfigThemes);
     // also hook up the appearance change notification with the global application appearance
@@ -580,11 +575,6 @@ - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *) [[ma
     return NSTerminateNow;
 }
 
-- (IBAction)OnMenuSendFeedback:(id) [[maybe_unused]] _sender
-{
-    self.feedbackManager.EmailFeedback();
-}
-
 - (BOOL)applicationShouldOpenUntitledFile:(NSApplication *) [[maybe_unused]] _sender
 {
     return true;
@@ -648,7 +638,7 @@ - (IBAction)OnShowHelp:(id) [[maybe_unused]] _sender
 
 - (IBAction)onMainMenuPerformGoToProductForum:(id) [[maybe_unused]] _sender
 {
-    const auto url = [NSURL URLWithString:@"http://magnumbytes.com/forum/"];
+    const auto url = [NSURL URLWithString:@"https://github.com/mikekazakov/nimble-commander/discussions"];
     [NSWorkspace.sharedWorkspace openURL:url];
 }
 
@@ -958,16 +948,6 @@ static void DoTemporaryFileStoragePurge()
     return m_PoolEnqueueFilter;
 }
 
-- (nc::FeedbackManager &)feedbackManager
-{
-    static nc::FeedbackManager *instance = [] {
-        auto fm = new nc::FeedbackManagerImpl();
-        atexit([] { instance->UpdateStatistics(); });
-        return fm;
-    }();
-    return *instance;
-}
-
 - (IBAction)onMainMenuShowLogs:(id)_sender
 {
     if( m_LogWindowController == nil )

diff --git a/Source/NimbleCommander/NimbleCommander/Bootstrap/Base.lproj/MainMenu.xib b/Source/NimbleCommander/NimbleCommander/Bootstrap/Base.lproj/MainMenu.xib
@@ -31,12 +31,6 @@
                                     <action selector="OnPreferencesCommand:" target="-1" id="890"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Email the Developer..." toolTip="Questions? Comments? Send me an email!" id="891">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="OnMenuSendFeedback:" target="-1" id="893"/>
-                                </connections>
-                            </menuItem>
                             <menuItem isSeparatorItem="YES" id="fPr-eP-snC">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>

diff --git a/Source/NimbleCommander/NimbleCommander/Bootstrap/ru.lproj/MainMenu.strings b/Source/NimbleCommander/NimbleCommander/Bootstrap/ru.lproj/MainMenu.strings
@@ -229,12 +229,6 @@
 /* Class = "NSMenuItem"; title = "4"; ObjectID = "885"; */
 "885.title" = "4";
 
-/* Class = "NSMenuItem"; ibShadowedToolTip = "Questions? Comments? Send me an email!"; ObjectID = "891"; */
-"891.ibShadowedToolTip" = "Вопросы? Комментарии? Отправьте мне письмо!";
-
-/* Class = "NSMenuItem"; title = "Email the Developer..."; ObjectID = "891"; */
-"891.title" = "Написать разработчику...";
-
 /* Class = "NSMenuItem"; title = "Preview"; ObjectID = "894"; */
 "894.title" = "Быстрый просмотр";
 

diff --git a/Source/NimbleCommander/NimbleCommander/Core/FeedbackManager.h b/Source/NimbleCommander/NimbleCommander/Core/FeedbackManager.h
diff --git a/Source/NimbleCommander/NimbleCommander/Core/FeedbackManager.mm b/Source/NimbleCommander/NimbleCommander/Core/FeedbackManager.mm
diff --git a/Source/NimbleCommander/NimbleCommander/Core/FeedbackManagerImpl.h b/Source/NimbleCommander/NimbleCommander/Core/FeedbackManagerImpl.h