mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-09-26 11:29:12 +02:00
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:
parent
a3b2dcdead
commit
3799355550
@ -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>
|
2013-10-28 Miguel de Dios <miguel.dedios@artica.es>
|
||||||
|
|
||||||
* .classpath: some changes that eclipse makes "automagicaly".
|
* .classpath: some changes that eclipse makes "automagicaly".
|
||||||
|
@ -47,13 +47,13 @@ public class Options extends Activity {
|
|||||||
EditText field;
|
EditText field;
|
||||||
|
|
||||||
field = (EditText)findViewById(R.id.url_option);
|
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.setText(url_pandora);
|
||||||
field = (EditText)findViewById(R.id.user_option);
|
field = (EditText)findViewById(R.id.user_option);
|
||||||
String user = preferences.getString("user", "");
|
String user = preferences.getString("user", "demo");
|
||||||
field.setText(user);
|
field.setText(user);
|
||||||
field = (EditText)findViewById(R.id.password_option);
|
field = (EditText)findViewById(R.id.password_option);
|
||||||
String password = preferences.getString("password", "");
|
String password = preferences.getString("password", "demo");
|
||||||
field.setText(password);
|
field.setText(password);
|
||||||
|
|
||||||
//Check if not empty the data of connection
|
//Check if not empty the data of connection
|
||||||
|
@ -54,9 +54,9 @@ public class PandoraWebView extends Activity {
|
|||||||
getString(R.string.const_string_preferences),
|
getString(R.string.const_string_preferences),
|
||||||
Activity.MODE_PRIVATE);
|
Activity.MODE_PRIVATE);
|
||||||
|
|
||||||
String url_pandora = preferences.getString("url_pandora", "");
|
String url_pandora = preferences.getString("url_pandora", "http://firefly.artica.es/pandora_demo/mobile");
|
||||||
String user = preferences.getString("user", "");
|
String user = preferences.getString("user", "demo");
|
||||||
String password = preferences.getString("password", "");
|
String password = preferences.getString("password", "demo");
|
||||||
|
|
||||||
WebView myWebView = (WebView) findViewById(R.id.webview);
|
WebView myWebView = (WebView) findViewById(R.id.webview);
|
||||||
WebSettings webSettings = myWebView.getSettings();
|
WebSettings webSettings = myWebView.getSettings();
|
||||||
@ -80,7 +80,7 @@ public class PandoraWebView extends Activity {
|
|||||||
});
|
});
|
||||||
|
|
||||||
//Check if not empty the data of connection
|
//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)
|
//Show the config dialog for to set a URL (normally the first execution)
|
||||||
i = new Intent(this, Options.class);
|
i = new Intent(this, Options.class);
|
||||||
startActivityForResult(i, 666);
|
startActivityForResult(i, 666);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user