projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace : iotivity -> iotivity-sec
[platform/upstream/iotivity.git]
/
service
/
easy-setup
/
mediator
/
richsdk
/
android
/
EasySetupCore
/
src
/
main
/
java
/
org
/
iotivity
/
service
/
easysetup
/
mediator
/
EnrolleeConf.java
diff --git
a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeConf.java
b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeConf.java
index
becbe52
..
fa4cfb2
100755
(executable)
--- a/
service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeConf.java
+++ b/
service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeConf.java
@@
-39,7
+39,7
@@
import java.util.List;
public class EnrolleeConf
{
private static final String TAG = EnrolleeConf.class.getName();
public class EnrolleeConf
{
private static final String TAG = EnrolleeConf.class.getName();
- protected OcRepresentation m
Prov
Rep = null;
+ protected OcRepresentation m
EasySetup
Rep = null;
/**
* Constructor
*
/**
* Constructor
*
@@
-48,12
+48,12
@@
public class EnrolleeConf
*/
public EnrolleeConf(OcRepresentation rep)
{
*/
public EnrolleeConf(OcRepresentation rep)
{
- m
Prov
Rep = rep;
+ m
EasySetup
Rep = rep;
}
public EnrolleeConf(EnrolleeConf enrolleeConf)
{
}
public EnrolleeConf(EnrolleeConf enrolleeConf)
{
- m
ProvRep = enrolleeConf.getProvRes
Rep();
+ m
EasySetupRep = enrolleeConf.getEasySetup
Rep();
}
/**
}
/**
@@
-63,12
+63,12
@@
public class EnrolleeConf
*/
public String getDeviceName()
{
*/
public String getDeviceName()
{
- if(m
Prov
Rep == null)
+ if(m
EasySetup
Rep == null)
{
return null;
}
{
return null;
}
- List<OcRepresentation> children = m
Prov
Rep.getChildren();
+ List<OcRepresentation> children = m
EasySetup
Rep.getChildren();
for (OcRepresentation child : children) {
if(child.getUri().indexOf(ESConstants.OC_RSRVD_ES_URI_DEVCONF) != -1)
for (OcRepresentation child : children) {
if(child.getUri().indexOf(ESConstants.OC_RSRVD_ES_URI_DEVCONF) != -1)
@@
-103,12
+103,12
@@
public class EnrolleeConf
*/
public String getModelNumber()
{
*/
public String getModelNumber()
{
- if(m
Prov
Rep == null)
+ if(m
EasySetup
Rep == null)
{
return null;
}
{
return null;
}
- List<OcRepresentation> children = m
Prov
Rep.getChildren();
+ List<OcRepresentation> children = m
EasySetup
Rep.getChildren();
for (OcRepresentation child : children) {
if(child.getUri().indexOf(ESConstants.OC_RSRVD_ES_URI_DEVCONF) != -1)
for (OcRepresentation child : children) {
if(child.getUri().indexOf(ESConstants.OC_RSRVD_ES_URI_DEVCONF) != -1)
@@
-143,15
+143,15
@@
public class EnrolleeConf
*/
public ArrayList<WIFI_MODE> getWiFiModes()
{
*/
public ArrayList<WIFI_MODE> getWiFiModes()
{
- if(m
Prov
Rep == null)
+ if(m
EasySetup
Rep == null)
{
return null;
}
{
return null;
}
- List<OcRepresentation> children = m
Prov
Rep.getChildren();
+ List<OcRepresentation> children = m
EasySetup
Rep.getChildren();
ArrayList<WIFI_MODE> modes = new ArrayList<WIFI_MODE>();
for (OcRepresentation child : children) {
ArrayList<WIFI_MODE> modes = new ArrayList<WIFI_MODE>();
for (OcRepresentation child : children) {
- if(child.getUri().indexOf(ESConstants.OC_RSRVD_ES_URI_WIFI) != -1)
+ if(child.getUri().indexOf(ESConstants.OC_RSRVD_ES_URI_WIFI
CONF
) != -1)
{
try {
OcRepresentation rep;
{
try {
OcRepresentation rep;
@@
-185,15
+185,15
@@
public class EnrolleeConf
*/
public WIFI_FREQ getWiFiFreq()
{
*/
public WIFI_FREQ getWiFiFreq()
{
- if(m
Prov
Rep == null)
+ if(m
EasySetup
Rep == null)
{
return WIFI_FREQ.WIFI_FREQ_NONE;
}
{
return WIFI_FREQ.WIFI_FREQ_NONE;
}
- List<OcRepresentation> children = m
Prov
Rep.getChildren();
+ List<OcRepresentation> children = m
EasySetup
Rep.getChildren();
for (OcRepresentation child : children) {
for (OcRepresentation child : children) {
- if(child.getUri().indexOf(ESConstants.OC_RSRVD_ES_URI_WIFI) != -1)
+ if(child.getUri().indexOf(ESConstants.OC_RSRVD_ES_URI_WIFI
CONF
) != -1)
{
try{
OcRepresentation rep;
{
try{
OcRepresentation rep;
@@
-225,15
+225,15
@@
public class EnrolleeConf
*/
public boolean isCloudAccessible()
{
*/
public boolean isCloudAccessible()
{
- if(m
Prov
Rep == null)
+ if(m
EasySetup
Rep == null)
{
return false;
}
{
return false;
}
- List<OcRepresentation> children = m
Prov
Rep.getChildren();
+ List<OcRepresentation> children = m
EasySetup
Rep.getChildren();
for (OcRepresentation child : children) {
for (OcRepresentation child : children) {
- if(child.getUri().indexOf(ESConstants.OC_RSRVD_ES_URI_C
LOUDSERVER
) != -1)
+ if(child.getUri().indexOf(ESConstants.OC_RSRVD_ES_URI_C
OAPCLOUDCONF
) != -1)
{
return true;
}
{
return true;
}
@@
-241,9
+241,9
@@
public class EnrolleeConf
return false;
}
return false;
}
- public OcRepresentation get
ProvRes
Rep()
+ public OcRepresentation get
EasySetup
Rep()
{
{
- return m
Prov
Rep;
+ return m
EasySetup
Rep;
}
}
}
}