Log -> SecureLog

Change-Id: I7bc3338fac44e6ccdddae603b6b235da54c8556c

diff --git a/project/src/CameraTools.cpp b/project/src/CameraTools.cpp
index bbb4ee0..4757cd3 100644 (file)
--- a/project/src/CameraTools.cpp
+++ b/project/src/CameraTools.cpp
@@ -50,7 +50,7 @@ CameraTools::StartCamera(ICameraEventListener &listener,
 
     if (IsFailed(__pCamera->Construct(listener, CAMERA_PRIMARY)))
     {
-       AppLogExceptionTag(pTag, "Construct failed with %s", GetErrorMessage(GetLastResult()));
+       AppSecureLogExceptionTag(pTag, "Construct failed with %s", GetErrorMessage(GetLastResult()));
        delete __pCamera;
        __pCamera = null;
         return false;
@@ -58,19 +58,19 @@ CameraTools::StartCamera(ICameraEventListener &listener,
 
     if (IsFailed(__pCamera->PowerOn()))
     {
-       AppLogExceptionTag(pTag, "PowerOn failed with %s", GetErrorMessage(GetLastResult()));
+       AppSecureLogExceptionTag(pTag, "PowerOn failed with %s", GetErrorMessage(GetLastResult()));
         return false;
     }
 
     if (IsFailed(__pCamera->SetPreviewFormat(Tizen::Graphics::PIXEL_FORMAT_YCbCr420_PLANAR)))
     {
-       AppLogExceptionTag(pTag, "SetPreviewFormat failed with %s", GetErrorMessage(GetLastResult()));
+       AppSecureLogExceptionTag(pTag, "SetPreviewFormat failed with %s", GetErrorMessage(GetLastResult()));
         return false;
     }
 
     if (IsFailed(__pCamera->SetPreviewFrameRate(30)))
     {
-       AppLogExceptionTag(pTag, "SetPreviewFrameRate failed with %s", GetErrorMessage(GetLastResult()));
+       AppSecureLogExceptionTag(pTag, "SetPreviewFrameRate failed with %s", GetErrorMessage(GetLastResult()));
         return false;
     }
 
@@ -126,13 +126,13 @@ CameraTools::StartCamera(ICameraEventListener &listener,
 
     if (IsFailed(__pCamera->SetPreviewResolution(__choosenResolution)))
     {
-       AppLogExceptionTag(pTag, "SetPreviewResolution failed with %s", GetErrorMessage(GetLastResult()));
+       AppSecureLogExceptionTag(pTag, "SetPreviewResolution failed with %s", GetErrorMessage(GetLastResult()));
         return false;
     }
 
        if (IsFailed(__pCamera->SetFocusMode(Tizen::Media::CAMERA_FOCUS_MODE_NORMAL)))
        {
-               AppLogExceptionTag(pTag, "SetFocusMode CAMERA_FOCUS_MODE_NORMAL failed with %s", GetErrorMessage(GetLastResult()));
+               AppSecureLogExceptionTag(pTag, "SetFocusMode CAMERA_FOCUS_MODE_NORMAL failed with %s", GetErrorMessage(GetLastResult()));
        }
 
     __width = __pCamera->GetPreviewResolution().width;
@@ -149,7 +149,7 @@ CameraTools::StopCamera(void)
        Suspend();
         if (IsFailed(__pCamera->PowerOff()))
         {
-               AppLogExceptionTag(pTag, "PowerOff failed with %s", GetErrorMessage(GetLastResult()));
+               AppSecureLogExceptionTag(pTag, "PowerOff failed with %s", GetErrorMessage(GetLastResult()));
         }
         delete __pCamera;
         __pCamera = null;
@@ -166,12 +166,12 @@ CameraTools::Suspend(void)
        {
                if (IsFailed(__pCamera->StopPreview()))
                        {
-                               AppLogExceptionTag(pTag, "StopPreview failed with %s", GetErrorMessage(GetLastResult()));
+                               AppSecureLogExceptionTag(pTag, "StopPreview failed with %s", GetErrorMessage(GetLastResult()));
                        }
        }
        else
        {
-                       AppLogExceptionTag(pTag, "StopPreview camera state %i", __pCamera->GetState());
+                       AppSecureLogExceptionTag(pTag, "StopPreview camera state %i", __pCamera->GetState());
        }
     }
 }
@@ -181,7 +181,7 @@ CameraTools::Restart(void)
 {
        if (__pCamera && __pCamera->IsPoweredOn())
        {
-               AppLogExceptionTag(pTag, "Restart camera state %i", __pCamera->GetState());
+               AppSecureLogExceptionTag(pTag, "Restart camera state %i", __pCamera->GetState());
 
                bool res = true;
                switch(__pCamera->GetState())
@@ -191,7 +191,7 @@ CameraTools::Restart(void)
                case CAMERA_STATE_CAPTURED:
                        if (IsFailed(__pCamera->StartPreview(null, true)))
                        {
-                               AppLogExceptionTag(pTag, "StartPreview failed with %s", GetErrorMessage(GetLastResult()));
+                               AppSecureLogExceptionTag(pTag, "StartPreview failed with %s", GetErrorMessage(GetLastResult()));
                                res = false;
                        }
                        break;
@@ -200,11 +200,11 @@ CameraTools::Restart(void)
                case CAMERA_STATE_AUTO_FOCUSING:
                        break;
                case CAMERA_STATE_ERROR:
-                       AppLogExceptionTag(pTag, "Camera is in error state");
+                       AppSecureLogExceptionTag(pTag, "Camera is in error state");
                        res = false;
                        break;
                default:
-                       AppLogExceptionTag(pTag, "Camera is in state %i", __pCamera->GetState());
+                       AppSecureLogExceptionTag(pTag, "Camera is in state %i", __pCamera->GetState());
                        res = false;
                        break;
                }
@@ -239,7 +239,7 @@ CameraTools::ZoomIn(void)
     {
         if (IsFailed(__pCamera->ZoomIn()))
                {
-                       AppLogExceptionTag(pTag, "ZoomIn failed with %s", GetErrorMessage(GetLastResult()));
+                       AppSecureLogExceptionTag(pTag, "ZoomIn failed with %s", GetErrorMessage(GetLastResult()));
                }
     }
 }
@@ -251,7 +251,7 @@ CameraTools::ZoomOut(void)
     {
         if (IsFailed(__pCamera->ZoomOut()))
                {
-                       AppLogExceptionTag(pTag, "ZoomIn failed with %s", GetErrorMessage(GetLastResult()));
+                       AppSecureLogExceptionTag(pTag, "ZoomIn failed with %s", GetErrorMessage(GetLastResult()));
                }
     }
 }

diff --git a/project/src/QrCodeRecognizerEntry.cpp b/project/src/QrCodeRecognizerEntry.cpp
index 12c305c..51003cf 100644 (file)
--- a/project/src/QrCodeRecognizerEntry.cpp
+++ b/project/src/QrCodeRecognizerEntry.cpp
@@ -45,7 +45,7 @@ OspMain(int argc, char *pArgv[])
     r = Tizen::App::UiApp::Execute(QrCodeRecognizer::CreateInstance, pArgs);
     if (IsFailed(r))
     {
-        AppLogException("Application execution failed-[%s].", GetErrorMessage(r));
+        AppSecureLogException("Application execution failed-[%s].", GetErrorMessage(r));
         r &= 0x0000FFFF;
     }
 

diff --git a/project/src/QrCodeRecognizerSample.cpp b/project/src/QrCodeRecognizerSample.cpp
index a5bf591..c065312 100644 (file)
--- a/project/src/QrCodeRecognizerSample.cpp
+++ b/project/src/QrCodeRecognizerSample.cpp
@@ -187,7 +187,7 @@ QrCodeRecognizer::OnAppTerminating(AppRegistry& appRegistry, bool forcedTerminat
 void
 QrCodeRecognizer::OnForeground(void)
 {
-       AppLogDebugTag(pTagApp, "OnForeground");
+       AppSecureLogTag(pTagApp, "OnForeground");
     PowerManager::KeepScreenOnState(true, false);
     CameraTools::Restart();
 }
@@ -196,7 +196,7 @@ QrCodeRecognizer::OnForeground(void)
 void
 QrCodeRecognizer::OnBackground(void)
 {
-       AppLogDebugTag(pTagApp, "OnBackground");
+       AppSecureLogTag(pTagApp, "OnBackground");
     CameraTools::Suspend();
 }
 
@@ -232,7 +232,7 @@ QrCodeRecognizer::OnBatteryLevelChanged(BatteryLevel batteryLevel)
 void
 QrCodeRecognizer::OnScreenOn (void)
 {
-       AppLogDebugTag(pTagApp, "OnScreenOn");
+       AppSecureLogTag(pTagApp, "OnScreenOn");
     PowerManager::KeepScreenOnState(true, false);
     CameraTools::Restart();
 }
@@ -240,7 +240,7 @@ QrCodeRecognizer::OnScreenOn (void)
 void
 QrCodeRecognizer::OnScreenOff (void)
 {
-       AppLogDebugTag(pTagApp, "OnScreenOff");
+       AppSecureLogTag(pTagApp, "OnScreenOff");
     CameraTools::Suspend();
 }
 

diff --git a/project/src/Renderer.cpp b/project/src/Renderer.cpp
index e0ae019..d561efb 100644 (file)
--- a/project/src/Renderer.cpp
+++ b/project/src/Renderer.cpp
@@ -285,7 +285,7 @@ Renderer::loadShader(GLenum type, const char *shaderSrc)
             char* infoLog = (char*)malloc (sizeof(char) * infoLen);
 
             glGetShaderInfoLog (shader, infoLen, NULL, infoLog);
-            AppLogExceptionTag ("QrCodeRecognizer", "Error compiling shader:\n%s\n", infoLog);
+            AppSecureLogExceptionTag ("QrCodeRecognizer", "Error compiling shader:\n%s\n", infoLog);
 
             free (infoLog);
         }
@@ -348,7 +348,7 @@ Renderer::loadProgram(const char *vertShaderSrc, const char *fragShaderSrc)
             char* infoLog = (char*)malloc (sizeof(char) * infoLen);
 
             glGetProgramInfoLog (programObject, infoLen, NULL, infoLog);
-            AppLogExceptionTag("ImageRecognizer", "Error linking program: %s", infoLog);
+            AppSecureLogExceptionTag("ImageRecognizer", "Error linking program: %s", infoLog);
 
             free (infoLog);
         }

diff --git a/project/src/Tracker.cpp b/project/src/Tracker.cpp
index b74796d..52f5420 100644 (file)
--- a/project/src/Tracker.cpp
+++ b/project/src/Tracker.cpp
@@ -138,7 +138,7 @@ Tracker::OnCameraCaptured(Tizen::Base::ByteBuffer& capturedData, result r)
 void
 Tracker::OnCameraErrorOccurred(Tizen::Media::CameraErrorReason r)
 {
-       AppLogExceptionTag("CameraTools", "Camera state %i, Camera error reason %i", CameraTools::GetCamera()->GetState(), r);
+       AppSecureLogExceptionTag("CameraTools", "Camera state %i, Camera error reason %i", CameraTools::GetCamera()->GetState(), r);
 
        CameraTools::Restart();
 }
@@ -166,7 +166,7 @@ Tracker::Focus(bool objectVisible)
 
     if (frames >= 60)
     {
-       AppLogDebugTag("Tracker", "%s %i %i %i %i", GetErrorMessage(__pQrRecognizer->GetFocusRoi(*__pRoi)),
+       AppSecureLogTag("Tracker", "%s %i %i %i %i", GetErrorMessage(__pQrRecognizer->GetFocusRoi(*__pRoi)),
                        __pRoi->x,
                        __pRoi->y,
                        __pRoi->x + __pRoi->width,
@@ -190,11 +190,11 @@ Tracker::Focus(bool objectVisible)
             list.Add(pt);
             if (IsFailed(CameraTools::GetCamera()->SetAutoFocusPoint(list)))
             {
-               AppLogExceptionTag("CameraTools", "Tracker SetAutoFocusPoint failed %s", GetErrorMessage(GetLastResult()));
+               AppSecureLogExceptionTag("CameraTools", "Tracker SetAutoFocusPoint failed %s", GetErrorMessage(GetLastResult()));
             }
             if (IsFailed(CameraTools::GetCamera()->SetAutoFocus(false)))
             {
-               AppLogExceptionTag("CameraTools", "Tracker SetAutoFocus failed %s", GetErrorMessage(GetLastResult()));
+               AppSecureLogExceptionTag("CameraTools", "Tracker SetAutoFocus failed %s", GetErrorMessage(GetLastResult()));
             }
 
             already_focused = objectVisible;