Updated Private -> RSA

Change-Id: I8e990f7cab0bb2b46c617fb4822536537a6777d9

diff --git a/.project b/.project
new file mode 100644 (file)
index 0000000..c15a453
--- /dev/null
+++ b/.project
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>BluetoothChat</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.wst.common.project.facet.core.builder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>json.validation.builder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.tizen.web.jslint.nature.JSLintBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.tizen.web.css.nature.CSSBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.wst.validation.validationbuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.tizen.web.project.builder.WebBuilder</name>
+                       <arguments>
+                               <dictionary>
+                                       <key>usedLibraryType</key>
+                                       <value>WebUIFramework</value>
+                               </dictionary>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>json.validation.nature</nature>
+               <nature>org.tizen.web.jslint.nature.JSLintNature</nature>
+               <nature>org.tizen.web.css.nature.CSSNature</nature>
+               <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+               <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+               <nature>org.tizen.web.project.builder.WebNature</nature>
+       </natures>
+</projectDescription>

diff --git a/config.xml b/config.xml
index 808a5b9..daf92ea 100644 (file)
--- a/config.xml
+++ b/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets" id="http://sample-web-application.tizen.org/bt-chat" version="2.1.0" viewmodes="maximized">
-       <tizen:application id="QmwDyrmOzO.BluetoothChat" package="QmwDyrmOzO" required_version="2.1"/>
+<widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets" id="http://sample-web-application.tizen.org/bt-chat" version="2.2.0" viewmodes="maximized">
+       <tizen:application id="QmwDyrmOzO.BluetoothChat" package="QmwDyrmOzO" required_version="2.2"/>
        <content src="index.html"/>
        <icon src="icon.png"/>
        <name>BluetoothChat</name>

diff --git a/css/style.css b/css/style.css
index 3d2847a..02bdcf7 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -55,6 +55,10 @@
        text-align: center;
 }
 
+html {
+       background: white !important;
+}
+
 #start-content {
        background-color: white;
 }

diff --git a/index.html b/index.html
index 5ce7257..de43bf8 100644 (file)
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@
        <meta name="description" content="bt-chat"/>
        <meta name="viewport" content="width=360, user-scalable=no"/>
 
-       <title>BluetoothChat</title>
+       <title>Bluetooth chat</title>
        <script src="/usr/share/tizen-web-ui-fw/latest/js/jquery.min.js"></script>
        <script src="/usr/share/tizen-web-ui-fw/latest/js/tizen-web-ui-fw-libs.min.js"></script>
        <script src="/usr/share/tizen-web-ui-fw/latest/js/tizen-web-ui-fw.min.js" data-framework-theme="tizen-white" data-framework-viewport-scale="false"></script>
@@ -18,14 +18,14 @@
 <body>
        <div id="start" data-role="page" data-add-back-btn="header">
                <div id="start-header" data-role="header" data-position="fixed">
-                       <h1>BLUETOOTH CHAT</h1>
+                       <h1>Bluetooth chat</h1>
                </div>
 
                <div id="start-content" data-role="content" data-scroll="none">
                        <div class="box">
-                               <div data-role="button" class="ui-btn-start" id="serverButton" style="display: none;">Set name and start server</div>
-                               <div data-role="button" class="ui-btn-start" id="clientButton" style="display: none;">Set name and join client</div>
-                               <div data-role="button" class="ui-btn-start" id="turnOnButton" style="display: none;">Turn bluetooth radio on</div>
+                               <div data-role="button" class="ui-btn-start" id="serverButton" style="display: none;">Create server</div>
+                               <div data-role="button" class="ui-btn-start" id="clientButton" style="display: none;">Join server</div>
+                               <div data-role="button" class="ui-btn-start" id="turnOnButton" style="display: none;">Turn bluetooth on</div>
                                <div id="start-monit" style="display: none;">
                                        <p>... waiting for bluetooth radio ...</p>
                                </div>

diff --git a/js/app.ui.events.js b/js/app.ui.events.js
index ff873f8..d76f756 100644 (file)
--- a/js/app.ui.events.js
+++ b/js/app.ui.events.js
@@ -171,6 +171,17 @@ function UiEvents(parent) {
                        $('body').on('touchstart', '#visibilityPopup-screen', function () {
                                $('#visibilityOK').trigger('tap');
                        });
+
+                       document.addEventListener('tizenhwkey', function(e) {
+                               if (e.keyName == "back") {
+                                       if ($.mobile.activePage.attr('id') === 'start') {
+                                               tizen.application.getCurrentApplication().exit();
+                                       } else {
+                                               history.back();
+                                       }
+                               }
+                       });
+
                }
        };
 }());

diff --git a/js/app.ui.js b/js/app.ui.js
index 6317458..e35250c 100644 (file)
--- a/js/app.ui.js
+++ b/js/app.ui.js
@@ -214,6 +214,7 @@ function Ui(callback) {
                        ul = content.find('ul');
                        ul.append(listElement);
                        ul.listview('refresh');
+                       this.checkSendButtonState();
                        setTimeout(function () { self.moveMessagesListDown(content, ul.height()); }, 200);
                },