projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 0.9.2
[platform/upstream/iotivity.git]
/
service
/
things-manager
/
sampleapp
/
android
/
con-server
/
src
/
com
/
example
/
con_server
/
MainActivity.java
diff --git
a/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/MainActivity.java
b/service/things-manager/sampleapp/android/con-server/src/com/example/con_server/MainActivity.java
index
63d9286
..
1acdc3b
100644
(file)
--- a/
service/things-manager/sampleapp/android/con-server/src/com/example/con_server/MainActivity.java
+++ b/
service/things-manager/sampleapp/android/con-server/src/com/example/con_server/MainActivity.java
@@
-46,7
+46,7
@@
import android.widget.EditText;
*/
public class MainActivity extends Activity {
*/
public class MainActivity extends Activity {
- private final String LOG_TAG = this.getClass().getSimpleName();
+ private final String LOG_TAG =
"[CON-SERVER]" +
this.getClass().getSimpleName();
private Handler mHandler;
private static MainActivity mainActivityObj;
private ConfigurationServer conServerObj;
private Handler mHandler;
private static MainActivity mainActivityObj;
private ConfigurationServer conServerObj;
@@
-72,6
+72,7
@@
public class MainActivity extends Activity {
switch (msg.what) {
case 0:
editText.setText(message);
switch (msg.what) {
case 0:
editText.setText(message);
+ Log.i(LOG_TAG, message);
}
}
};
}
}
};
@@
-124,6
+125,7
@@
public class MainActivity extends Activity {
AlertDialog dialog = dialogBuilder.create();
dialog.show();
AlertDialog dialog = dialogBuilder.create();
dialog.show();
+ Log.i(LOG_TAG, "WiFi is not enabled/connected! Please connect the WiFi and start application again...");
return;
}
return;
}
@@
-162,6
+164,7
@@
public class MainActivity extends Activity {
dialog.setProgress(0);
dialog.setMax(100);
dialog.show();
dialog.setProgress(0);
dialog.setMax(100);
dialog.show();
+ Log.i(LOG_TAG, "Rebooting.. Please wait ...");
Thread thread = new Thread() {
@Override
public void run() {
Thread thread = new Thread() {
@Override
public void run() {