Merge pull request #91 from legendlee1314/master
authorKenneth Rohde Christiansen <kenneth@webkit.org>
Fri, 16 Aug 2013 10:43:21 +0000 (03:43 -0700)
committerKenneth Rohde Christiansen <kenneth@webkit.org>
Fri, 16 Aug 2013 10:43:21 +0000 (03:43 -0700)
[SystemInfo] Implement WIFI-NETWORK module

1  2 
system_info/system_info.gyp
system_info/system_info_sim.h

@@@ -18,8 -18,8 +18,9 @@@
          [ 'extension_host_os == "mobile"', {
            'variables': {
              'packages': [
+               'capi-network-connection',
                'capi-system-info',
 +              'capi-telephony-sim',
                'vconf',
              ]
            },
@@@ -21,50 -16,17 +21,50 @@@ class SysInfoSim 
      static SysInfoSim instance(api);
      return instance;
    }
 -  ~SysInfoSim() { }
 +  ~SysInfoSim() { PlatformUninitialize(); }
    void Get(picojson::value& error, picojson::value& data);
-   void StartListen() { }
-   void StopListen() { }
+   void StartListening() { }
+   void StopListening() { }
  
 +  enum SystemInfoSimState {
 +    SYSTEM_INFO_SIM_ABSENT = 0,
 +    SYSTEM_INFO_SIM_INITIALIZING,
 +    SYSTEM_INFO_SIM_READY,
 +    SYSTEM_INFO_SIM_REQUIRED,
 +    SYSTEM_INFO_SIM_PIN_REQUIRED,
 +    SYSTEM_INFO_SIM_PUB_REQUIRED,
 +    SYSTEM_INFO_SIM_NETWORK_LOCKED,
 +    SYSTEM_INFO_SIM_SIM_LOCKED,
 +    SYSTEM_INFO_SIM_UNKNOWN
 +  };
 +
 +#if defined(TIZEN_MOBILE)
 +  static void OnSimStateChanged(sim_state_e state, void *user_data);
 +#endif
 +
   private:
 -  explicit SysInfoSim(ContextAPI* api) {
 +  explicit SysInfoSim(ContextAPI* api)
 +    : state_(SYSTEM_INFO_SIM_UNKNOWN) {
      api_ = api;
 +    PlatformInitialize();
    }
  
 +#if defined(TIZEN_MOBILE)
 +  std::string ToSimStateString(SystemInfoSimState state);
 +  SystemInfoSimState Get_systeminfo_sim_state(sim_state_e state);
 +#endif
 +  void PlatformInitialize();
 +  void PlatformUninitialize();
 +
    ContextAPI* api_;
 +  SystemInfoSimState state_;
 +  std::string operatorName_;
 +  std::string msisdn_;
 +  std::string iccid_;
 +  std::string mcc_;
 +  std::string mnc_;
 +  std::string msin_;
 +  std::string spn_;
  
    DISALLOW_COPY_AND_ASSIGN(SysInfoSim);
  };