tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-10-28 Miguel de Dios <miguel.dedios@artica.es> 

* src/pandorafms/pandorafmsandroidconsole/Options.java,
	src/pandorafms/pandorafmsandroidconsole/PandoraWebView.java: setted
	the default values the Pandora public demo.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8970 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-10-28 14:58:54 +00:00
parent 2c0b6a35da
commit 3bfcf5b78c
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extras/PandoraFMS_android_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-10-28 Miguel de Dios <miguel.dedios@artica.es>
* src/pandorafms/pandorafmsandroidconsole/Options.java,
src/pandorafms/pandorafmsandroidconsole/PandoraWebView.java: setted
the default values the Pandora public demo.
2013-10-28 Miguel de Dios <miguel.dedios@artica.es>
* .classpath: some changes that eclipse makes "automagicaly".

6
extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/Options.java
View File

@ -47,13 +47,13 @@ public class Options extends Activity {
EditText field;
field = (EditText)findViewById(R.id.url_option);
String url_pandora = preferences.getString("url_pandora", "");
String url_pandora = preferences.getString("url_pandora", "http://firefly.artica.es/pandora_demo/mobile");
field.setText(url_pandora);
field = (EditText)findViewById(R.id.user_option);
String user = preferences.getString("user", "");
String user = preferences.getString("user", "demo");
field.setText(user);
field = (EditText)findViewById(R.id.password_option);
String password = preferences.getString("password", "");
String password = preferences.getString("password", "demo");
field.setText(password);
//Check if not empty the data of connection

8
extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/PandoraWebView.java
View File

@ -54,9 +54,9 @@ public class PandoraWebView extends Activity {
getString(R.string.const_string_preferences),
Activity.MODE_PRIVATE);
String url_pandora = preferences.getString("url_pandora", "");
String user = preferences.getString("user", "");
String password = preferences.getString("password", "");
String url_pandora = preferences.getString("url_pandora", "http://firefly.artica.es/pandora_demo/mobile");
String user = preferences.getString("user", "demo");
String password = preferences.getString("password", "demo");
WebView myWebView = (WebView) findViewById(R.id.webview);
WebSettings webSettings = myWebView.getSettings();
@ -80,7 +80,7 @@ public class PandoraWebView extends Activity {
});
//Check if not empty the data of connection
if (url_pandora.equals("")) {
if (url_pandora.equals("http://firefly.artica.es/pandora_demo/mobile")) {
//Show the config dialog for to set a URL (normally the first execution)
i = new Intent(this, Options.class);
startActivityForResult(i, 666);