[Android] Register display listener, create activity manager in CXBMC…

…App::onStart(). Now matches the reverse operations in CXBMCApp::onDestroy().
xbmc · Mar 19, 2022 · 0789af7 · 0789af7
1 parent d0b4d73
commit 0789af7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/xbmc/platform/android/activity/XBMCApp.cpp b/xbmc/platform/android/activity/XBMCApp.cpp
@@ -234,7 +234,11 @@ void CXBMCApp::onStart()
     intentFilter.addAction("android.intent.action.SCREEN_OFF");
     intentFilter.addAction("android.net.conn.CONNECTIVITY_CHANGE");
     registerReceiver(*this, intentFilter);
-    m_mediaSession.reset(new CJNIXBMCMediaSession());
+    m_mediaSession = std::make_unique<CJNIXBMCMediaSession>();
+    m_activityManager =
+        std::make_unique<CJNIActivityManager>(getSystemService(CJNIContext::ACTIVITY_SERVICE));
+    m_inputHandler.setDPI(GetDPI());
+    RegisterDisplayListener();
   }
 }
 
@@ -376,13 +380,13 @@ void CXBMCApp::onLostFocus()
   m_hasFocus = false;
 }
 
-void CXBMCApp::RegisterDisplayListener(CVariant* variant)
+void CXBMCApp::RegisterDisplayListener()
 {
   CJNIDisplayManager displayManager(getSystemService("display"));
   if (displayManager)
   {
     android_printf("CXBMCApp: installing DisplayManager::DisplayListener");
-    displayManager.registerDisplayListener(CXBMCApp::Get().getDisplayListener());
+    displayManager.registerDisplayListener(m_displayListener.get_raw());
   }
 }
 
@@ -392,16 +396,13 @@ void CXBMCApp::UnregisterDisplayListener()
   if (displayManager)
   {
     android_printf("CXBMCApp: removing DisplayManager::DisplayListener");
-    displayManager.unregisterDisplayListener(getDisplayListener());
+    displayManager.unregisterDisplayListener(m_displayListener.get_raw());
   }
 }
 
 void CXBMCApp::Initialize()
 {
   CServiceBroker::GetAnnouncementManager()->AddAnnouncer(this);
-  runNativeOnUiThread(RegisterDisplayListener, nullptr);
-  m_activityManager.reset(new CJNIActivityManager(getSystemService(CJNIContext::ACTIVITY_SERVICE)));
-  m_inputHandler.setDPI(GetDPI());
 }
 
 void CXBMCApp::Deinitialize()

diff --git a/xbmc/platform/android/activity/XBMCApp.h b/xbmc/platform/android/activity/XBMCApp.h
@@ -141,7 +141,6 @@ class CXBMCApp
   void onDisplayAdded(int displayId) override;
   void onDisplayChanged(int displayId) override;
   void onDisplayRemoved(int displayId) override;
-  jni::jhobject getDisplayListener() { return m_displayListener.get_raw(); }
 
   bool isValid() { return m_activity != NULL; }
 
@@ -259,7 +258,7 @@ class CXBMCApp
   static void SetRefreshRateCallback(CVariant *rate);
   static void SetDisplayModeCallback(CVariant *mode);
 
-  static void RegisterDisplayListener(CVariant*);
+  void RegisterDisplayListener();
   void UnregisterDisplayListener();
 
   ANativeActivity* m_activity{nullptr};