Pictogram 1.6, Beta 6. Trabajando en bug Andres Ruiz Garcia.Tablero con categorias

parent 51525008
Showing with 22 additions and 590 deletions
......@@ -49,7 +49,7 @@ public class RestapiWrapper {
}
public void setToken(String token) {
this.token=token;
this.token=token;
}
public String getToken() {
if (token==null) throw new java.lang.NullPointerException("Token has no value. Use constructor properly or RestapiWrapper.setToken must be invoked previously");
......
......@@ -66,13 +66,13 @@ public class Vocabulary implements Iterable<Picto> {
switch (action) {
case delete: {
Log.i(this.getClass().getCanonicalName(), "Picto delete "+picto_grid+"."+picto_id);
Log.i(LOG_TAG, "Picto delete "+picto_grid+"."+picto_id);
removePicto(picto_grid,picto_id);
break;
}
case update:{
Log.i(this.getClass().getCanonicalName(), "Picto update "+args.toString());
Log.i(LOG_TAG, "Picto update "+args.toString());
try {
modifyAttsPicto(picto_grid, picto_id, args.getJSONObject("attributes"), id_child_grid);
} catch (JSONException e) {
......@@ -107,6 +107,7 @@ public class Vocabulary implements Iterable<Picto> {
}
}
},listener};
Log.e(this.getClass().getName(), "******************************new vocabulary talk????? ");
new VocabularyTalk(room, vocabulary_listeners);
addActionTalkListener(action_listener);
......@@ -116,6 +117,7 @@ public class Vocabulary implements Iterable<Picto> {
else actionTalk.addListener(listener);
}
public void removeActionTalkListener(ActionTalk.iActionListener listener) {
Log.e(LOG_TAG,"*****************************REMOVING LISTENER");
actionTalk.removeListener(listener);
}
......
......@@ -47,13 +47,12 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
private long nextRestfullSynchro;
private long nextServerPing;
public NetService(iNetServiceStatus listener) {
this.updated=RestapiWrapper.ping(PCBcontext.getContext().getResources().getString(R.string.server), ping);
RestapiWrapper.ping(PCBcontext.getContext().getResources().getString(R.string.server), ping);
this.updated=false;
nextServerPing=0;
this.listeners = new Vector<>(2);
this.listeners.add(listener);
if (listener instanceof iNetServiceDevice) ((iNetServiceDevice)listener).build();
Log.i(LOG_TAG, "Checking Pictogram server access...");
Log.i(LOG_TAG, this.updated ? "Pictogram server access ok" : "Pictogram server access failed, Internet connection available?");
ScheduledThreadPoolExecutor exec = new ScheduledThreadPoolExecutor(1);
exec.scheduleWithFixedDelay(this, 0, PCBcontext.getContext().getResources().getInteger(R.integer.netservice_timing), TimeUnit.SECONDS);
}
......@@ -162,7 +161,7 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
final long now = new Date().getTime();
if (now >= nextServerPing || !updated) {
nextServerPing = now + serverPingTimming;
PCBcontext.getRestapiWrapper().ask(updated ? ping_session : ping, new RestapiWrapper.iRestapiListener() {
PCBcontext.getRestapiWrapper().ask(updated ? ping_session : ping, new RestapiWrapper.iRestapiListener() {
@Override
public void preExecute() {
......@@ -191,12 +190,10 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
if (PCBcontext.is_user_offline())
login();
else if (PCBcontext.is_user_online()) {
PCBcontext.getRoom().connect();
synchronizeStuData();
PCBcontext.getActionLog().batch();
}
;
} else {
try {
PCBcontext.getRestapiWrapper().setToken(result.getString("token"));
......@@ -222,7 +219,7 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
@Override
public void error(RestapiWrapper.HTTPException e) {
Log.e(LOG_TAG, "Error when asking:" + e.getMessage());
Log.e(LOG_TAG, "Error when PING asking:" + e.getMessage()+" .Ping session?"+!updated);
setOffline(e);
}
});
......@@ -296,7 +293,7 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
public void setOnline() {
this.updated=true;
Log.e(LOG_TAG, "PCB online");
Log.i(LOG_TAG, "PCB online");
notifyStatus();
}
......
......@@ -37,6 +37,10 @@ public class VocabularyDownloader {
this.imgListener=imgListener;
}
public void synchronize() {
if (TransactionMonitor.getDBOnTransaction()!=null) {
Log.e(LOG_TAG,"Vocabulary synchronization aborted because the previous Transaction is not finished");
return;
}
synchronize_upload(new PictoUploader.iDeletedOnServer() {
@Override
public void ok(int npictos) {
......
......@@ -100,6 +100,7 @@ public class Room {
}
public boolean inRoom() {return this.inRoom;}
public void listen(String msg, Emitter.Listener listener) {
Log.e(this.getClass().getName(), "******************************Listening to " + msg);
this.socket.registerMessage(msg, listener);
this.listeners.put(msg, listener);
}
......@@ -107,10 +108,10 @@ public class Room {
for (String msg: this.listeners.keySet()) {
if (this.socket!=null) {
Log.e(this.getClass().getName(), "******************************Listening to " + msg);
Log.e(this.getClass().getName(), "******************************Listening again to " + msg);
this.socket.unregisterMessage(msg);
this.socket.registerMessage(msg, this.listeners.get(msg));
}else Log.e(this.getClass().getName(), "******************************NULL socket when listening to " + msg);
}else Log.e(this.getClass().getName(), "NULL socket when listening to " + msg);
}
}
......@@ -125,7 +126,7 @@ public class Room {
}
private void unlisten() {
for (String msg: this.listeners.keySet()) {
Log.i(this.getClass().getName(), "Unlistening to "+msg);
Log.e(this.getClass().getName(), "*********************************Unlistening to "+msg);
this.socket.unregisterMessage(msg);
}
}
......@@ -143,8 +144,8 @@ public class Room {
Log.i(this.getClass().getName(), "Leaving room");
unlisten();
unsubscribe();
this.socket.destroy();
this.socket=null;
//this.socket.destroy();
//this.socket=null;
}
}
......
......@@ -124,7 +124,7 @@ public final class PCBcontext {
}
public static void unset_user() {
Log.e(PCBcontext.class.getCanonicalName(), "User unset. Student " + getPcbdb().getCurrentUser().get_name_stu());
Log.i(PCBcontext.class.getCanonicalName(), "User unset. Student " + getPcbdb().getCurrentUser().get_name_stu());
if (room!=null) room.exit();
if (TransactionMonitor.getDBOnTransaction()!=null) {
Log.e(LOG_TAG, "Unset when transaction is active, aborting transaction");
......@@ -132,7 +132,7 @@ public final class PCBcontext {
}
pcbdb = null;
room = null;
//room = null;
vocabulary = null;
studentTalk = null;
getNetService().notifyStatus();
......
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Automatically generated file. DO NOT MODIFY -->
<!-- Values from product flavor: DevFlavor -->
<string name="apk" translatable="false">pictogram_dev.apk</string>
<string name="server" translatable="false">https://dev.pictogramweb.com</string>
<bool name="ssl_connect">false</bool>
<!-- Values from default config. -->
<bool name="NotifyAllwaysVisible">true</bool>
<string name="VersionManagerClass" translatable="false">com.yottacode.pictogram.communicator.VersionManager</string>
</resources>
[
{
"outputFile": "C:\\home\\german\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 66,
"endOffset": 117
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-h720dp-v13\\values-h720dp-v13.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 66,
"endOffset": 117
}
}
}
]
},
{
"outputFile": "C:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 66,
"endOffset": 117
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\values-h720dp-v13\\values-h720dp-v13.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 66,
"endOffset": 117
}
}
}
]
},
{
"outputFile": "C:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 66,
"endOffset": 117
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-h720dp-v13\\values-h720dp-v13.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 66,
"endOffset": 117
}
}
}
]
}
]
\ No newline at end of file
[
{
"outputFile": "C:\\home\\german\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endLine": 6,
"endColumn": 13,
"endOffset": 327
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-hdpi-v4\\values-hdpi-v4.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endLine": 6,
"endColumn": 13,
"endOffset": 327
}
}
}
]
},
{
"outputFile": "C:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endLine": 6,
"endColumn": 13,
"endOffset": 327
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-hdpi-v4\\values-hdpi-v4.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endLine": 6,
"endColumn": 13,
"endOffset": 327
}
}
}
]
},
{
"outputFile": "C:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endLine": 6,
"endColumn": 13,
"endOffset": 327
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\values-hdpi-v4\\values-hdpi-v4.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endLine": 6,
"endColumn": 13,
"endOffset": 327
}
}
}
]
}
]
\ No newline at end of file
[
{
"outputFile": "C:\\home\\german\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-land\\values-land.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 69,
"endOffset": 120
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 69,
"endOffset": 120
}
}
},
{
"to": {
"startLine": 3,
"startColumn": 4,
"startOffset": 125,
"endColumn": 63,
"endOffset": 184
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 3,
"startColumn": 4,
"startOffset": 125,
"endColumn": 63,
"endOffset": 184
}
}
},
{
"to": {
"startLine": 4,
"startColumn": 4,
"startOffset": 189,
"endColumn": 70,
"endOffset": 255
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 4,
"startColumn": 4,
"startOffset": 189,
"endColumn": 70,
"endOffset": 255
}
}
},
{
"to": {
"startLine": 5,
"startColumn": 4,
"startOffset": 260,
"endColumn": 67,
"endOffset": 323
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 5,
"startColumn": 4,
"startOffset": 260,
"endColumn": 67,
"endOffset": 323
}
}
}
]
},
{
"outputFile": "C:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-land\\values-land.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 69,
"endOffset": 120
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 69,
"endOffset": 120
}
}
},
{
"to": {
"startLine": 3,
"startColumn": 4,
"startOffset": 125,
"endColumn": 63,
"endOffset": 184
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 3,
"startColumn": 4,
"startOffset": 125,
"endColumn": 63,
"endOffset": 184
}
}
},
{
"to": {
"startLine": 4,
"startColumn": 4,
"startOffset": 189,
"endColumn": 70,
"endOffset": 255
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 4,
"startColumn": 4,
"startOffset": 189,
"endColumn": 70,
"endOffset": 255
}
}
},
{
"to": {
"startLine": 5,
"startColumn": 4,
"startOffset": 260,
"endColumn": 67,
"endOffset": 323
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 5,
"startColumn": 4,
"startOffset": 260,
"endColumn": 67,
"endOffset": 323
}
}
}
]
},
{
"outputFile": "C:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-land\\values-land.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 69,
"endOffset": 120
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 69,
"endOffset": 120
}
}
},
{
"to": {
"startLine": 3,
"startColumn": 4,
"startOffset": 125,
"endColumn": 63,
"endOffset": 184
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 3,
"startColumn": 4,
"startOffset": 125,
"endColumn": 63,
"endOffset": 184
}
}
},
{
"to": {
"startLine": 4,
"startColumn": 4,
"startOffset": 189,
"endColumn": 70,
"endOffset": 255
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 4,
"startColumn": 4,
"startOffset": 189,
"endColumn": 70,
"endOffset": 255
}
}
},
{
"to": {
"startLine": 5,
"startColumn": 4,
"startOffset": 260,
"endColumn": 67,
"endOffset": 323
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 5,
"startColumn": 4,
"startOffset": 260,
"endColumn": 67,
"endOffset": 323
}
}
}
]
}
]
\ No newline at end of file
[
{
"outputFile": "C:\\home\\german\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-ldltr-v21\\values-ldltr-v21.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 112,
"endOffset": 163
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-ldltr-v21\\values-ldltr-v21.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 112,
"endOffset": 163
}
}
}
]
},
{
"outputFile": "C:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-ldltr-v21\\values-ldltr-v21.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 112,
"endOffset": 163
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-ldltr-v21\\values-ldltr-v21.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 112,
"endOffset": 163
}
}
}
]
},
{
"outputFile": "C:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-ldltr-v21\\values-ldltr-v21.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 112,
"endOffset": 163
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\values-ldltr-v21\\values-ldltr-v21.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 112,
"endOffset": 163
}
}
}
]
}
]
\ No newline at end of file
[
{
"outputFile": "C:\\home\\german\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-port\\values-port.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 55,
"endOffset": 106
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-port\\values-port.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 55,
"endOffset": 106
}
}
}
]
},
{
"outputFile": "C:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-port\\values-port.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 55,
"endOffset": 106
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\values-port\\values-port.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 55,
"endOffset": 106
}
}
}
]
},
{
"outputFile": "C:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-port\\values-port.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 55,
"endOffset": 106
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-port\\values-port.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 55,
"endOffset": 106
}
}
}
]
}
]
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment