Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
abccd55a
authored
Jun 29, 2016
by
Fernando Martínez Santiago
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
working on issue
#470
parent
42488c29
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
3 deletions
android/Pictogram/app/src/main/java/com/yottacode/pictogram/grammar/Vocabulary.java
android/Pictogram/app/src/main/java/com/yottacode/pictogram/gui/SerialActivity.java
android/Pictogram/app/src/main/java/com/yottacode/pictogram/net/NetService.java
android/Pictogram/app/src/main/java/com/yottacode/pictogram/grammar/Vocabulary.java
View file @
abccd55a
...
...
@@ -147,7 +147,6 @@ public class Vocabulary implements Iterable<Picto> {
@Override
public
void
result
(
JSONArray
result
)
{
if
(
result
!=
null
)
{
final
String
jpicto
=
"picto"
;
final
String
jid
=
"id"
;
...
...
android/Pictogram/app/src/main/java/com/yottacode/pictogram/gui/SerialActivity.java
View file @
abccd55a
...
...
@@ -251,7 +251,7 @@ public class SerialActivity extends Activity {
@Override
public
void
error
(
Exception
e
)
{
progressDialog
.
dismiss
();
GUITools
.
show_alert
(
PCBcontext
.
getContext
()
,
R
.
string
.
serverError
,
e
.
getMessage
());
GUITools
.
show_alert
(
SerialActivity
.
this
,
R
.
string
.
serverError
,
e
.
getMessage
());
Log
.
e
(
this
.
getClass
().
getCanonicalName
(),
"Server error:"
+
e
.
getLocalizedMessage
());
}
});
...
...
android/Pictogram/app/src/main/java/com/yottacode/pictogram/net/NetService.java
View file @
abccd55a
...
...
@@ -129,6 +129,7 @@ public class NetService implements Runnable {
public
void
result
(
JSONObject
result
)
{
if
(!
updated
)
{
updated
=
true
;
// Comprobar si hay usuario offline, para hacer login transparente
if
(
PCBcontext
.
is_user_offline
()){
login
();
...
...
@@ -137,7 +138,6 @@ public class NetService implements Runnable {
PCBcontext
.
getRoom
().
reconnect
();
PCBcontext
.
getVocabulary
().
synchronize
();
PCBcontext
.
getActionLog
().
batch
();
updated
=
true
;
}
}
Log
.
i
(
this
.
getClass
().
getName
(),
"PCB status checked. Updated? "
+
updated
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment