CHG: [droid] Generify Context

xbmc/Application.cpp

@@ -563,8 +563,8 @@ bool CApplication::Create()
   bool extready = CXBMCApp::GetExternalStorage(extstorage);
   CLog::Log(LOGNOTICE, "External storage path = %s; status = %s", extstorage.c_str(), extready ? "ok" : "nok");
   CLog::Log(LOGNOTICE, "System library paths = %s", CJNISystem::getProperty("java.library.path").c_str());
-  CLog::Log(LOGNOTICE, "App library path = %s", CXBMCApp::getApplicationInfo().nativeLibraryDir.c_str());
-  CLog::Log(LOGNOTICE, "APK = %s", CXBMCApp::getPackageResourcePath().c_str());
+  CLog::Log(LOGNOTICE, "App library path = %s", CXBMCApp::get()->getApplicationInfo().nativeLibraryDir.c_str());
+  CLog::Log(LOGNOTICE, "APK = %s", CXBMCApp::get()->getPackageResourcePath().c_str());
   CLog::Log(LOGNOTICE, "HasTouchScreen = %s", CAndroidFeatures::HasTouchScreen() ? "yes" : "no");
 #endif
 
@@ -944,7 +944,7 @@ bool CApplication::InitDirectoriesLinux()
   CSpecialProtocol::SetXBMCBinAddonPath(appBinPath + "/addons");
 
 #if defined(TARGET_ANDROID)
-  CXBMCApp::InitDirectories();
+  CXBMCApp::get()->InitDirectories();
 #endif
 
   return true;
@@ -1528,7 +1528,7 @@ void CApplication::OnSettingAction(const CSetting *setting)
     g_windowManager.ActivateWindow(WINDOW_PICTURES);
 #ifdef TARGET_ANDROID
   else if (settingId == CSettings::SETTING_DEBUG_UPLOADLOG)
-    CXBMCApp::uploadLog();
+    CXBMCApp::get()->uploadLog();
 #endif
 }
 
@@ -2414,7 +2414,7 @@ bool CApplication::OnAction(const CAction &action)
 
 // Android has steps based on the max available volume level
 #if defined(TARGET_ANDROID)
-      float step = (VOLUME_MAXIMUM - VOLUME_MINIMUM) / CXBMCApp::GetMaxSystemVolume();
+      float step = (VOLUME_MAXIMUM - VOLUME_MINIMUM) / CXBMCApp::get()->GetMaxSystemVolume();
 #else
       float step   = (VOLUME_MAXIMUM - VOLUME_MINIMUM) / volumesteps;
 
@@ -2550,7 +2550,7 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
 #if defined(TARGET_ANDROID)
     if (pMsg->params.size())
     {
-      CXBMCApp::StartActivity(pMsg->params[0],
+      CXBMCApp::get()->StartActivity(pMsg->params[0],
         pMsg->params.size() > 1 ? pMsg->params[1] : "",
         pMsg->params.size() > 2 ? pMsg->params[2] : "",
         pMsg->params.size() > 3 ? pMsg->params[3] : "");
@@ -3989,7 +3989,7 @@ bool CApplication::WakeUpScreenSaverAndDPMS(bool bPowerOffKeyPressed /* = false
 
 #ifdef TARGET_ANDROID
   // Screensaver deactivated -> acquire wake lock
-  CXBMCApp::EnableWakeLock(true);
+  CXBMCApp::get()->EnableWakeLock(true);
 #endif
 
   if(result)
@@ -4148,7 +4148,7 @@ void CApplication::ActivateScreenSaver(bool forceType /*= false */)
   {
 #ifdef TARGET_ANDROID
     if (m_screenSaver->ID() == "screensaver.xbmc.builtin.system")
-      CXBMCApp::EnableWakeLock(false);
+      CXBMCApp::get()->EnableWakeLock(false);
 #endif
     return;
   }

xbmc/Util.cpp

@@ -1792,7 +1792,7 @@ std::string CUtil::ResolveExecutablePath()
   else
     strExecutablePath = buf;
 #elif defined(TARGET_ANDROID)
-  strExecutablePath = CXBMCApp::getApplicationInfo().nativeLibraryDir;
+  strExecutablePath = CXBMCApp::get()->getApplicationInfo().nativeLibraryDir;
 
   std::string appName = CCompileInfo::GetAppName();
   std::string libName = "lib" + appName + ".so";

xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp

@@ -665,8 +665,8 @@ bool CAESinkAUDIOTRACK::Initialize(AEAudioFormat &format, std::string &device)
   if (m_passthrough && (m_wantsIECPassthrough && m_encoding != CJNIAudioFormat::ENCODING_IEC61937))
   {
     CXBMCApp::get()->AcquireAudioFocus();
-    m_volume = CXBMCApp::GetSystemVolume();
-    CXBMCApp::SetSystemVolume(1.0);
+    m_volume = CXBMCApp::get()->GetSystemVolume();
+    CXBMCApp::get()->SetSystemVolume(1.0);
   }
 
   return true;
@@ -680,7 +680,7 @@ void CAESinkAUDIOTRACK::Deinitialize()
   // Restore volume
   if (m_volume != -1)
   {
-    CXBMCApp::SetSystemVolume(m_volume);
+    CXBMCApp::get()->SetSystemVolume(m_volume);
     CXBMCApp::get()->ReleaseAudioFocus();
   }
 
@@ -923,7 +923,7 @@ void CAESinkAUDIOTRACK::EnumerateDevicesEx(AEDeviceInfoList &list, bool force)
   // Enumerate audio devices on API >= 23
   if (CJNIAudioManager::GetSDKVersion() >= 23)
   {
-    CJNIAudioManager audioManager(CJNIContext::getSystemService("audio"));
+    CJNIAudioManager audioManager(CXBMCApp::get()->getSystemService("audio"));
     CJNIAudioDeviceInfos audiodevices = audioManager.getDevices(CJNIAudioManager::GET_DEVICES_OUTPUTS);
     if (g_advancedSettings.CanLogComponent(LOGAUDIO))
       LogAudoDevices("EnumerateDevicesEx", audiodevices);

xbmc/cores/ExternalPlayer/ExternalPlayer.cpp

@@ -483,7 +483,7 @@ BOOL CExternalPlayer::ExecuteAppAndroid(const char* strSwitches,const char* strP
 {
   CLog::Log(LOGNOTICE, "%s: %s", __FUNCTION__, strSwitches);
 
-  bool ret = CXBMCApp::StartActivity(strSwitches, "android.intent.action.VIEW", "video/*", strPath);
+  bool ret = CXBMCApp::get()->StartActivity(strSwitches, "android.intent.action.VIEW", "video/*", strPath);
 
   if (!ret)
   {

xbmc/cores/VideoPlayer/VideoRenderers/VideoCaptures/RenderCaptureAndroid.cpp

@@ -37,7 +37,7 @@ CRenderCaptureAndroid::CRenderCaptureAndroid()
 CRenderCaptureAndroid::~CRenderCaptureAndroid()
 {
   if (g_advancedSettings.m_videoUseDroidProjectionCapture)
-    CXBMCApp::StopCapture();
+    CXBMCApp::get()->StopCapture();
   delete[] m_pixels;
 }
 
@@ -57,7 +57,7 @@ void CRenderCaptureAndroid::BeginRender()
   if (g_advancedSettings.m_videoUseDroidProjectionCapture)
   {
     m_asyncSupported = true;
-    CXBMCApp::startCapture(m_width, m_height);
+    CXBMCApp::get()->startCapture(m_width, m_height);
   }
 }
 
@@ -84,7 +84,7 @@ void CRenderCaptureAndroid::ReadOut()
   if (g_advancedSettings.m_videoUseDroidProjectionCapture)
   {
     jni::CJNIImage image;
-    if (CXBMCApp::GetCapture(image))
+    if (CXBMCApp::get()->GetCapture(image))
     {
       int iWidth = image.getWidth();
       int iHeight = image.getHeight();

xbmc/dialogs/GUIDialogKeyboardGeneric.cpp

@@ -586,7 +586,7 @@ void CGUIDialogKeyboardGeneric::OnVoiceRecognition()
   CJNIIntent intent = CJNIIntent(CJNIRecognizerIntent::ACTION_RECOGNIZE_SPEECH);
   intent.putExtra(CJNIRecognizerIntent::EXTRA_LANGUAGE_MODEL, CJNIRecognizerIntent::LANGUAGE_MODEL_FREE_FORM);
   CJNIIntent result;
-  if (CXBMCApp::WaitForActivityResult(intent, ACTION_RECOGNIZE_SPEECH_REQID, result) == CJNIBase::RESULT_OK)
+  if (CXBMCApp::get()->WaitForActivityResult(intent, ACTION_RECOGNIZE_SPEECH_REQID, result) == CJNIBase::RESULT_OK)
   {
     CJNIArrayList<std::string> guesses = result.getStringArrayListExtra(CJNIRecognizerIntent::EXTRA_RESULTS);
     if (guesses.size())

xbmc/filesystem/AndroidAppDirectory.cpp

@@ -53,7 +53,7 @@ bool CAndroidAppDirectory::GetDirectory(const CURL& url, CFileItemList &items)
 
   if (dirname == "apps")
   {
-    std::vector<androidPackage> applications = CXBMCApp::GetApplications();
+    std::vector<androidPackage> applications = CXBMCApp::get()->GetApplications();
     if (applications.empty())
     {
       CLog::Log(LOGERROR, "CAndroidAppDirectory::GetDirectory Application lookup listing failed");

xbmc/filesystem/AndroidAppFile.cpp

@@ -58,7 +58,7 @@ bool CFileAndroidApp::Open(const CURL& url)
   m_packageName =  URIUtils::GetFileName(url.Get());
   m_packageName = m_packageName.substr(0, m_packageName.size() - 4);
 
-  std::vector<androidPackage> applications = CXBMCApp::GetApplications();
+  std::vector<androidPackage> applications = CXBMCApp::get()->GetApplications();
   for(std::vector<androidPackage>::iterator i = applications.begin(); i != applications.end(); ++i)
   {
     if ((*i).packageName == m_packageName)
@@ -77,7 +77,7 @@ bool CFileAndroidApp::Exists(const CURL& url)
   std::string appname =  URIUtils::GetFileName(url.Get());
   appname = appname.substr(0, appname.size() - 4);
 
-  std::vector<androidPackage> applications = CXBMCApp::GetApplications();
+  std::vector<androidPackage> applications = CXBMCApp::get()->GetApplications();
   for(std::vector<androidPackage>::iterator i = applications.begin(); i != applications.end(); ++i)
   {
     if ((*i).packageName == appname)
@@ -98,7 +98,7 @@ unsigned int CFileAndroidApp::ReadIcon(unsigned char** lpBuf, unsigned int* widt
 
   if (CJNIBuild::SDK_INT >= 15 && m_icon)
   {
-    CJNIResources res = CJNIContext::GetPackageManager().getResourcesForApplication(m_packageName);
+    CJNIResources res = CXBMCApp::get()->GetPackageManager().getResourcesForApplication(m_packageName);
     if (res)
     {
       for (int i=0; densities[i] != -1 && !bmp; ++i)
@@ -123,7 +123,7 @@ unsigned int CFileAndroidApp::ReadIcon(unsigned char** lpBuf, unsigned int* widt
 
   if (!bmp)
   {
-    CJNIDrawable drw = CJNIContext::GetPackageManager().getApplicationIcon(m_packageName);
+    CJNIDrawable drw = CXBMCApp::get()->GetPackageManager().getApplicationIcon(m_packageName);
     if (xbmc_jnienv()->ExceptionCheck())
       xbmc_jnienv()->ExceptionClear();
     else if (!drw);

xbmc/network/android/NetworkAndroid.cpp

@@ -66,7 +66,7 @@ std::string& CNetworkInterfaceAndroid::GetName()
 
 bool CNetworkInterfaceAndroid::IsEnabled()
 {
-  CJNIConnectivityManager connman(CXBMCApp::getSystemService(CJNIContext::CONNECTIVITY_SERVICE));
+  CJNIConnectivityManager connman(CXBMCApp::get()->getSystemService(CJNIContext::CONNECTIVITY_SERVICE));
   CJNINetworkInfo ni = connman.getNetworkInfo(m_network);
   if (!ni)
     return false;
@@ -76,7 +76,7 @@ bool CNetworkInterfaceAndroid::IsEnabled()
 
 bool CNetworkInterfaceAndroid::IsConnected()
 {
-  CJNIConnectivityManager connman(CXBMCApp::getSystemService(CJNIContext::CONNECTIVITY_SERVICE));
+  CJNIConnectivityManager connman(CXBMCApp::get()->getSystemService(CJNIContext::CONNECTIVITY_SERVICE));
   CJNINetworkInfo ni = connman.getNetworkInfo(m_network);
   if (!ni)
     return false;
@@ -86,7 +86,7 @@ bool CNetworkInterfaceAndroid::IsConnected()
 
 bool CNetworkInterfaceAndroid::IsWireless()
 {
-  CJNIConnectivityManager connman(CXBMCApp::getSystemService(CJNIContext::CONNECTIVITY_SERVICE));
+  CJNIConnectivityManager connman(CXBMCApp::get()->getSystemService(CJNIContext::CONNECTIVITY_SERVICE));
   CJNINetworkInfo ni = connman.getNetworkInfo(m_network);
   if (!ni)
     return false;
@@ -237,14 +237,14 @@ std::string CNetworkInterfaceAndroid::GetCurrentWirelessEssId()
 {
   std::string ret;
 
-  CJNIConnectivityManager connman(CXBMCApp::getSystemService(CJNIContext::CONNECTIVITY_SERVICE));
+  CJNIConnectivityManager connman(CXBMCApp::get()->getSystemService(CJNIContext::CONNECTIVITY_SERVICE));
   CJNINetworkInfo ni = connman.getNetworkInfo(m_network);
   if (!ni)
     return "";
 
   if (ni.getType() == CJNIConnectivityManager::TYPE_WIFI)
   {
-    CJNIWifiManager wm = CXBMCApp::getSystemService("wifi");
+    CJNIWifiManager wm = CXBMCApp::get()->getSystemService("wifi");
     if (wm.isWifiEnabled())
     {
       CJNIWifiInfo wi = wm.getConnectionInfo();
@@ -384,7 +384,7 @@ void CNetworkAndroid::RetrieveInterfaces()
   m_oldInterfaces = m_interfaces;
   m_interfaces.clear();
 
-  CJNIConnectivityManager connman(CXBMCApp::getSystemService(CJNIContext::CONNECTIVITY_SERVICE));
+  CJNIConnectivityManager connman(CXBMCApp::get()->getSystemService(CJNIContext::CONNECTIVITY_SERVICE));
   std::vector<CJNINetwork> networks = connman.getAllNetworks();
 
   for (auto n : networks)

xbmc/network/android/ZeroconfAndroid.cpp

@@ -20,14 +20,14 @@
 
 #include "ZeroconfAndroid.h"
 
-#include <androidjni/Context.h>
 #include "utils/log.h"
 
+#include "platform/android/activity/XBMCApp.h"
 #include "threads/SingleLock.h"
 
 CZeroconfAndroid::CZeroconfAndroid()
 {
-  m_manager = CJNIContext::getSystemService(CJNIContext::NSD_SERVICE);
+  m_manager = CXBMCApp::get()->getSystemService(CJNIContext::NSD_SERVICE);
 }
 
 CZeroconfAndroid::~CZeroconfAndroid()

xbmc/network/android/ZeroconfBrowserAndroid.cpp

@@ -21,8 +21,8 @@
 #include "ZeroconfBrowserAndroid.h"
 
 #include <androidjni/jutils-details.hpp>
-#include <androidjni/Context.h>
 
+#include "platform/android/activity/XBMCApp.h"
 #include "guilib/GUIMessage.h"
 #include "guilib/GUIWindowManager.h"
 #include "GUIUserMessages.h"
@@ -35,7 +35,7 @@
 
 CZeroconfBrowserAndroid::CZeroconfBrowserAndroid()
 {
-  m_manager = CJNIContext::getSystemService(CJNIContext::NSD_SERVICE);
+  m_manager = CXBMCApp::get()->getSystemService(CJNIContext::NSD_SERVICE);
 }
 
 CZeroconfBrowserAndroid::~CZeroconfBrowserAndroid()

xbmc/peripherals/bus/android/PeripheralBusAndroid.cpp

@@ -42,10 +42,10 @@ CPeripheralBusAndroid::CPeripheralBusAndroid(CPeripherals *manager) :
   m_bNeedsPolling = false;
 
   // register for input device callbacks
-  CXBMCApp::RegisterInputDeviceCallbacks(this);
+  CXBMCApp::get()->RegisterInputDeviceCallbacks(this);
 
   // register for input device events
-  CXBMCApp::RegisterInputDeviceEventHandler(this);
+  CXBMCApp::get()->RegisterInputDeviceEventHandler(this);
 
   // get all currently connected input devices
   m_scanResults = GetInputDevices();
@@ -54,10 +54,10 @@ CPeripheralBusAndroid::CPeripheralBusAndroid(CPeripherals *manager) :
 CPeripheralBusAndroid::~CPeripheralBusAndroid()
 {
   // unregister from input device events
-  CXBMCApp::UnregisterInputDeviceEventHandler();
+  CXBMCApp::get()->UnregisterInputDeviceEventHandler();
 
   // unregister from input device callbacks
-  CXBMCApp::UnregisterInputDeviceCallbacks();
+  CXBMCApp::get()->UnregisterInputDeviceCallbacks();
 }
 
 bool CPeripheralBusAndroid::InitializeProperties(CPeripheral& peripheral)
@@ -78,7 +78,7 @@ bool CPeripheralBusAndroid::InitializeProperties(CPeripheral& peripheral)
     return false;
   }
 
-  const CJNIViewInputDevice device = CXBMCApp::GetInputDevice(deviceId);
+  const CJNIViewInputDevice device = CXBMCApp::get()->GetInputDevice(deviceId);
   if (!device)
   {
     CLog::Log(LOGWARNING, "CPeripheralBusAndroid: failed to get input device with ID %d", deviceId);
@@ -184,7 +184,7 @@ void CPeripheralBusAndroid::OnInputDeviceAdded(int deviceId)
         return;
     }
 
-    const CJNIViewInputDevice device = CXBMCApp::GetInputDevice(deviceId);
+    const CJNIViewInputDevice device = CXBMCApp::get()->GetInputDevice(deviceId);
     if (!device)
     {
       CLog::Log(LOGWARNING, "CPeripheralBusAndroid: failed to add input device with ID %d because it couldn't be found", deviceId);
@@ -212,7 +212,7 @@ void CPeripheralBusAndroid::OnInputDeviceChanged(int deviceId)
     {
       if (result->m_strLocation == deviceLocation)
       {
-        const CJNIViewInputDevice device = CXBMCApp::GetInputDevice(deviceId);
+        const CJNIViewInputDevice device = CXBMCApp::get()->GetInputDevice(deviceId);
         if (!device)
         {
           CLog::Log(LOGWARNING, "CPeripheralBusAndroid: failed to update input device \"%s\" with ID %d because it couldn't be found", result->m_strDeviceName.c_str(), deviceId);
@@ -297,11 +297,11 @@ PeripheralScanResults CPeripheralBusAndroid::GetInputDevices()
   CLog::Log(LOGINFO, "CPeripheralBusAndroid: scanning for input devices...");
 
   PeripheralScanResults results;
-  std::vector<int> deviceIds = CXBMCApp::GetInputDeviceIds();
+  std::vector<int> deviceIds = CXBMCApp::get()->GetInputDeviceIds();
 
   for (const auto& deviceId : deviceIds)
   {
-    const CJNIViewInputDevice device = CXBMCApp::GetInputDevice(deviceId);
+    const CJNIViewInputDevice device = CXBMCApp::get()->GetInputDevice(deviceId);
     if (!device)
     {
       CLog::Log(LOGWARNING, "CPeripheralBusAndroid: no input device with ID %d found", deviceId);

xbmc/pictures/GUIWindowSlideShow.cpp

@@ -279,7 +279,7 @@ void CGUIWindowSlideShow::OnDeinitWindow(int nextWindowID)
 
 #if defined(TARGET_ANDROID)
   // enable android screensaver
-  CXBMCApp::EnableWakeLock(false);
+  CXBMCApp::get()->EnableWakeLock(false);
 #elif defined(TARGET_DARWIN_TVOS)
   CDarwinUtils::EnableOSScreenSaver(true);
 #endif
@@ -381,7 +381,7 @@ void CGUIWindowSlideShow::StartSlideShow()
 {
 #if defined(TARGET_ANDROID)
   // disable android screensaver
-  CXBMCApp::EnableWakeLock(true);
+  CXBMCApp::get()->EnableWakeLock(true);
 #elif defined(TARGET_DARWIN_TVOS)
   CDarwinUtils::EnableOSScreenSaver(false);
 #endif

xbmc/platform/android/activity/AndroidFeatures.cpp

@@ -22,9 +22,9 @@
 
 #include <cpu-features.h>
 #include <androidjni/JNIThreading.h>
-#include <androidjni/Context.h>
 #include <androidjni/PackageManager.h>
 
+#include "platform/android/activity/XBMCApp.h"
 #include "utils/log.h"
 
 bool CAndroidFeatures::HasNeon()
@@ -82,7 +82,7 @@ bool CAndroidFeatures::HasTouchScreen()
   static int hastouchscreen = -1;
   if (hastouchscreen == -1)
   {
-    if (CJNIContext::GetPackageManager().hasSystemFeature("android.hardware.touchscreen"))
+    if (CXBMCApp::get()->GetPackageManager().hasSystemFeature("android.hardware.touchscreen"))
       hastouchscreen = 1;
     else
       hastouchscreen = 0;
@@ -96,7 +96,7 @@ bool CAndroidFeatures::IsLeanback()
   static int isleanback = -1;
   if (isleanback == -1)
   {
-    if (CJNIContext::GetPackageManager().hasSystemFeature("android.software.leanback"))
+    if (CXBMCApp::get()->GetPackageManager().hasSystemFeature("android.software.leanback"))
       isleanback = 1;
     else
       isleanback = 0;