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
3f89a158
authored
Sep 08, 2017
by
Sebastián Collado Montañez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
problem with session ping solved
parent
30176d00
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
21 deletions
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/action/SubscribeAction.java
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/NetService.java
android/Pictogram/tabletlibrary/tabletlibrary.iml
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/action/SubscribeAction.java
View file @
3f89a158
...
@@ -13,22 +13,19 @@ import com.yottacode.pictogram.net.websockets.Room;
...
@@ -13,22 +13,19 @@ import com.yottacode.pictogram.net.websockets.Room;
*/
*/
public
class
SubscribeAction
extends
Action
{
public
class
SubscribeAction
extends
Action
{
//Picto Action types
//Picto Action types
public
static
final
String
SUBSCRIBE
=
"subscribe"
;
public
static
final
String
SUBSCRIBE
=
"subscribe"
;
public
static
final
String
ACTION
=
"/stu/subscribe"
;
public
static
final
String
ACTION
=
"/stu/subscribe"
;
@Override
@Override
public
boolean
is_local_action
()
{
public
boolean
is_local_action
()
{
return
false
;
return
false
;
}
}
public
SubscribeAction
(
){
public
SubscribeAction
(
){
super
(
SUBSCRIBE
);
super
(
SUBSCRIBE
);
}
}
public
String
get_action
()
{
return
ACTION
;}
public
String
get_action
()
{
return
ACTION
;}
}
}
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/NetService.java
View file @
3f89a158
...
@@ -184,9 +184,11 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
...
@@ -184,9 +184,11 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
//cada restfullSynchroTimming aprox. se fuerza sincronización de vocabulario y configuración de usuario
//cada restfullSynchroTimming aprox. se fuerza sincronización de vocabulario y configuración de usuario
long
now
=
new
Date
().
getTime
();
long
now
=
new
Date
().
getTime
();
if
(
PCBcontext
.
is_user_logged
())
{
if
(
PCBcontext
.
is_user_logged
())
{
if
(
restfullSynchroTimming
>
0
&&
(
now
>=
nextRestfullSynchro
))
{
if
(
restfullSynchroTimming
>
0
&&
(
now
>=
nextRestfullSynchro
))
{
Log
.
i
(
LOG_TAG
,
"Vocabulary request."
);
Log
.
i
(
LOG_TAG
,
"Vocabulary request."
);
PCBcontext
.
getRoom
().
connect
();
if
(!
PCBcontext
.
getRoom
().
inRoom
()){
PCBcontext
.
getRoom
().
connect
();
}
PCBcontext
.
getVocabulary
().
synchronize
();
PCBcontext
.
getVocabulary
().
synchronize
();
synchronizeStudentAttributes
();
synchronizeStudentAttributes
();
nextSynchro
(
now
+
restfullSynchroTimming
);
nextSynchro
(
now
+
restfullSynchroTimming
);
...
...
android/Pictogram/tabletlibrary/tabletlibrary.iml
View file @
3f89a158
...
@@ -121,16 +121,5 @@
...
@@ -121,16 +121,5 @@
<orderEntry
type=
"library"
exported=
""
name=
"play-services-ads-9.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"play-services-ads-9.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"play-services-ads-lite-9.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"play-services-ads-lite-9.2.1"
level=
"project"
/>
<orderEntry
type=
"module"
module-name=
"commonlibrary"
exported=
""
/>
<orderEntry
type=
"module"
module-name=
"commonlibrary"
exported=
""
/>
<orderEntry
type=
"library"
exported=
""
name=
"okhttp-ws-2.3.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"socket.io-client-0.5.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"okhttp-2.3.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"support-annotations-23.0.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"okio-1.3.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"gson-2.3"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"engine.io-client-0.5.0"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
name=
"appcompat-v7-21.0.3"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
scope=
"TEST"
name=
"hamcrest-core-1.3"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
scope=
"TEST"
name=
"junit-4.12"
level=
"project"
/>
<orderEntry
type=
"library"
exported=
""
scope=
"TEST"
name=
"json-20090211"
level=
"project"
/>
</component>
</component>
</module>
</module>
\ No newline at end of file
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