[4.0] Revert "[4.0] Addd to check privilege for capture"

This reverts commit c63a126323dbb421eff4f8ca0739a5053184a3c4.

Change-Id: I3318c5a26c2bb7072b13026aea91e67b946b4aaf

diff --git a/adaptors/tizen/capture-impl-tizen.cpp b/adaptors/tizen/capture-impl-tizen.cpp
index 98d6077..8384bee 100755 (executable)
--- a/adaptors/tizen/capture-impl-tizen.cpp
+++ b/adaptors/tizen/capture-impl-tizen.cpp
@@ -25,10 +25,6 @@
 #include <dali/integration-api/debug.h>
 #include <fstream>
 #include <string.h>
-#include <cynara-client.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <system_info.h>
 
 // INTERNAL INCLUDES
 #include <adaptor.h>
@@ -36,10 +32,6 @@
 namespace
 {
 unsigned int TIME_OUT_DURATION = 1000;
-const int SMACK_LABEL_LENGTH = 255;
-
-const char* const CYNARA_CHECK_FILE = "/proc/self/attr/current";
-const char* const SCREEN_SHOT_PRIVILEGE = "http://tizen.org/privilege/screenshot";
 }
 
 namespace Dali
@@ -76,11 +68,8 @@ CapturePtr Capture::New()
 {
   CapturePtr pWorker = new Capture();
 
-  if( pWorker->CheckPrivilege( SCREEN_SHOT_PRIVILEGE ) == false )
-  {
-    DALI_LOG_ERROR( "Capture privilege error: permission denied\n" );
-    return NULL;
-  }
+  // Second-phase construction
+  pWorker->Initialize();
 
   return pWorker;
 }
@@ -89,11 +78,8 @@ CapturePtr Capture::New( Dali::CameraActor cameraActor )
 {
   CapturePtr pWorker = new Capture( cameraActor );
 
-  if( pWorker->CheckPrivilege( SCREEN_SHOT_PRIVILEGE ) == false )
-  {
-    DALI_LOG_ERROR( "Capture privilege error: permission denied\n" );
-    return NULL;
-  }
+  // Second-phase construction
+  pWorker->Initialize();
 
   return pWorker;
 }
@@ -118,6 +104,10 @@ Dali::Capture::CaptureFinishedSignalType& Capture::FinishedSignal()
   return mFinishedSignal;
 }
 
+void Capture::Initialize()
+{
+}
+
 void Capture::CreateSurface( const Vector2& size )
 {
   DALI_ASSERT_ALWAYS(!mTbmSurface && "mTbmSurface is already created.");
@@ -378,52 +368,6 @@ bool Capture::Save()
   return mNativeImageSourcePtr->EncodeToFile( mPath );
 }
 
-bool Capture::CheckPrivilege( const char* privilege ) const
-{
-  cynara* cynara;
-  int fd = 0;
-  int ret = 0;
-  char subjectLabel[SMACK_LABEL_LENGTH + 1] = "";
-  char uid[10] = { 0, };
-  const char* clientSession = "";
-
-  ret = cynara_initialize( &cynara, NULL );
-  if( ret != CYNARA_API_SUCCESS )
-  {
-    return false;
-  }
-
-  fd = open( CYNARA_CHECK_FILE, O_RDONLY );
-  if( fd < 0 )
-  {
-    cynara_finish( cynara );
-    return false;
-  }
-
-  ret = read( fd, subjectLabel, SMACK_LABEL_LENGTH );
-  if( ret < 0 )
-  {
-    close( fd );
-    cynara_finish( cynara );
-    return false;
-  }
-
-  close( fd );
-
-  snprintf( uid, 10, "%d", getuid() );
-
-  ret = cynara_check( cynara, subjectLabel, clientSession, uid, privilege );
-  if( ret != CYNARA_API_ACCESS_ALLOWED )
-  {
-    cynara_finish( cynara );
-    return false;
-  }
-
-  cynara_finish( cynara );
-
-  return true;
-}
-
 }  // End of namespace Adaptor
 
 }  // End of namespace Internal

diff --git a/adaptors/tizen/capture-impl.h b/adaptors/tizen/capture-impl.h
index d172fdd..040cfaf 100755 (executable)
--- a/adaptors/tizen/capture-impl.h
+++ b/adaptors/tizen/capture-impl.h
@@ -79,6 +79,11 @@ public:
 protected:
 
   /**
+   * @brief Second-phase constructor. Must be called immediately after creating a new Capture;
+   */
+  void Initialize();
+
+  /**
    * @brief A reference counted object may only be deleted by calling Unreference()
    */
   virtual ~Capture();
@@ -199,14 +204,6 @@ private:
    */
   bool Save();
 
-  /**
-   * @brief Checks privilege for Capture
-   *
-   * @param[in] privilege The capture privilege
-   * @return True if input is capture privilege, false otherwise
-   */
-  bool CheckPrivilege( const char* privilege ) const;
-
 private:
 
   // Undefined

diff --git a/adaptors/wearable/capture/capture.h b/adaptors/wearable/capture/capture.h
index 58ee9d8..635a1e0 100644 (file)
--- a/adaptors/wearable/capture/capture.h
+++ b/adaptors/wearable/capture/capture.h
@@ -106,28 +106,22 @@ public:
   Capture();
 
   /**
-   * @PRIVLEVEL_PLATFORM
    * @brief Create an initialized Capture.
    *
    * @SINCE_1_3_4
-   * @PRIVILEGE_CAPTURE
    *
    * @return A handle to a newly allocated Dali resource.
    * @note Projection mode of default cameraActor is Dali::Camera::PERSPECTIVE_PROJECTION
-   * @note If permission denied by privilege occurs, a uninitialized handle is returned
    */
   static Capture New();
 
   /**
-   * @PRIVLEVEL_PLATFORM
    * @brief Create an initialized Capture.
    *
    * @SINCE_1_3_4
-   * @PRIVILEGE_CAPTURE
    *
    * @param[in] cameraActor An initialized CameraActor.
    * @return A handle to a newly allocated Dali resource.
-   * @note If permission denied by privilege occurs, a uninitialized handle is returned
    */
   static Capture New( Dali::CameraActor cameraActor );
 

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index 97f955c..2564c88 100644 (file)
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -499,13 +499,11 @@ LIBDALI_ADAPTOR_LA_CXXFLAGS += \
                       $(HAPTIC_CFLAGS) \
                       $(EFL_ASSIST_CFLAGS) \
                       $(SCREENCONNECTORPROVIDER_CFLAGS) \
-                      $(APPCORE_WATCH_CFLAGS) \
-                      $(CYNARA_CLIENT_CFLAGS)
+                      $(APPCORE_WATCH_CFLAGS)
 
 LIBDALI_ADAPTOR_LA_LIBADD += \
                       $(SCREENCONNECTORPROVIDER_LIBS) \
-                      $(APPCORE_WATCH_LIBS) \
-                      $(CYNARA_CLIENT_LIBS)
+                      $(APPCORE_WATCH_LIBS)
 endif
 
 if TV_PROFILE

diff --git a/build/tizen/adaptor/configure.ac b/build/tizen/adaptor/configure.ac
index 5346d0f..14c137a 100644 (file)
--- a/build/tizen/adaptor/configure.ac
+++ b/build/tizen/adaptor/configure.ac
@@ -235,7 +235,6 @@ PKG_CHECK_MODULES(SCREENCONNECTORPROVIDER, screen_connector_provider)
 PKG_CHECK_MODULES(APPFW_WATCH, capi-appfw-watch-application,
    [watch_available=yes], [watch_available=no] )
 PKG_CHECK_MODULES(APPCORE_WATCH, appcore-watch)
-PKG_CHECK_MODULES(CYNARA_CLIENT, cynara-client)
 if test "x$watch_available" = "xyes"; then
   DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DAPPCORE_WATCH_AVAILABLE"
 fi

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index c5025b0..963ae78 100755 (executable)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -53,7 +53,6 @@ BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(capi-appfw-watch-application)
 BuildRequires:  pkgconfig(appcore-watch)
 BuildRequires:  pkgconfig(screen_connector_provider)
-BuildRequires:  pkgconfig(cynara-client)
 %endif
 
 BuildRequires:  pkgconfig(gles20)