Pictogram 1.6, Beta 4, issue #431, #421, chivato de conexion en tablet supervisor incluido

parent 0e023f96
Showing with 122 additions and 51 deletions
......@@ -15,14 +15,17 @@ public class TransactionMonitor {
return db;
}
static public void startTransaction(SQLiteOpenHelper helper) {
if (getDBOnTransaction()==null) {
db = helper.getWritableDatabase();
db.enableWriteAheadLogging();
db.beginTransactionNonExclusive();
Log.i(LOG_TAG,"Transaction begins");
Log.i(LOG_TAG,"Transaction begins ");
} else
Log.e(LOG_TAG,"*********************Transaction is previously started and not finished");
}
static public void endTransaction(boolean succesfull) {
if (succesfull && db.inTransaction()) {//puede ocurrir que no haya nada
db.setTransactionSuccessful();
if (db.inTransaction()) {//puede ocurrir que no haya nada
if (succesfull) db.setTransactionSuccessful();
Log.i(LOG_TAG, "Transaction ends. Successfully? " + succesfull);
db.endTransaction();
}
......
......@@ -63,12 +63,20 @@ public class Device extends SQLiteOpenHelper {
}
}
@Override
public SQLiteDatabase getWritableDatabase() {
SQLiteDatabase db = TransactionMonitor.getDBOnTransaction();
if (db == null)
db = super.getWritableDatabase();
return db;
}
/**
* Set the value of a param.
*
*/
private void setParam(String param, String value) {
setParam(this.getWritableDatabase(),param,value);
setParam(this.getWritableDatabase(), param, value);
}
/**
......@@ -315,9 +323,7 @@ public class Device extends SQLiteOpenHelper {
public void insertUser(User user) {
SQLiteDatabase db = TransactionMonitor.getDBOnTransaction();
if (db==null)
db=this.getWritableDatabase();
SQLiteDatabase db = this.getWritableDatabase();
String sentence = "INSERT INTO users_detail values (" +
user.get_id_stu() + ", " +
......
......@@ -263,7 +263,7 @@ public class PCBDBHelper extends SQLiteOpenHelper {
values.put("url", picto.get_url());
values.put("translation",picto.get_translation());
values.put("attributes",picto.get_json_attrs());
db.insert("collection_detail", null, values);
db.insertWithOnConflict("collection_detail", null, values,SQLiteDatabase.CONFLICT_REPLACE);
}
Log.i(LOG_TAG,"Storage "+n+" pictos for student "+id_stu);
//db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
......
......@@ -266,6 +266,7 @@ public class UserLogin {
}
public void login(String username, String password, Activity activity, Class activityAfterLogin) {
if (PCBcontext.is_user_logged()) PCBcontext.unset_user();
boolean online = RestapiWrapper.ping(activity.getResources().getString(R.string.server), "server/ping");
if (isSupervisorLoginPattern(username))
......
......@@ -270,6 +270,7 @@ public class Vocabulary implements Iterable<Picto> {
else {
startpictos = new LinkedList<>();
LinkedList<Picto> pictos = this.pictos.get(PCBcontext.getPcbdb().getCurrentUser().get_active_grid());
if (pictos!=null && pictos.size()>0)
for (Picto picto : pictos) {
startpictos.add(picto);
}
......
......@@ -134,7 +134,10 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
public void restart_app(boolean resetPrevLogin) {
for (iNetServiceStatus listener: listeners)
if (listener instanceof iNetServiceDevice) ((iNetServiceDevice)listener).restart_app(resetPrevLogin);
if (listener instanceof iNetServiceDevice) {
((iNetServiceDevice) listener).restart_app(resetPrevLogin);
break;
}
}
......@@ -253,7 +256,7 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
try {
objects = new Object[]{new JSONObject().put("student",result)};
PCBcontext.getStudentTalk().call(objects);
Log.i(LOG_TAG,"Student attributes synchronized");
Log.i(LOG_TAG,"Student attributes synchronizing");
PCBcontext.getVocabulary().synchronize();
} catch (JSONException e) {
e.printStackTrace();
......@@ -300,6 +303,7 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
}
}
/**
* Created by Fernando on 12/08/2016.
*/
......
......@@ -17,6 +17,8 @@ import java.util.Hashtable;
*/
public class ServerLogin {
private static final String LOG_TAG =ServerLogin.class.getSimpleName();
public static void login_student(String username, String password, RestapiWrapper.iRestapiListener listener) {
login("stu/login", null, username, password, listener);
}
......
......@@ -18,7 +18,7 @@ public class StudentTalk implements Emitter.Listener {
private static final String URL ="updateStudent";
private static final String LOG_TAG = StudentTalk.class.getCanonicalName();
private String lastTalk=null;
private final iStudentListener[] listeners;
......@@ -32,7 +32,12 @@ public class StudentTalk implements Emitter.Listener {
if (PCBcontext.getPcbdb()!=null)
try {
JSONObject msg=((JSONObject) args[0]).getJSONObject("student");
Log.d(this.getClass().getName(), "Raw message: " +msg.toString());
if (lastTalk!=null && lastTalk.equals(msg.toString())) {
Log.e(LOG_TAG, "********************************Message from server duplicated!");
return;
}
lastTalk=msg.toString();
int id=msg.getInt("id");
String username=msg.getString("username");
String name=msg.getString("name");
......@@ -46,7 +51,7 @@ public class StudentTalk implements Emitter.Listener {
JSONObject license= msg.getJSONObject("license");
Log.i(LOG_TAG, "raw Received message " +msg.toString());
User user=PCBcontext.getPcbdb().getCurrentUser();
User updatedUser=new User(id, username, user.get_pwd_stu(), name, surname, id_active_scene, pic, gender, lang, attributes,
user.get_id_sup(), user.get_email_sup(), user.get_pwd_sup(), user.get_name_sup(), user.get_surname_sup(), user.get_url_img_sup(), user.get_gender_sup(),
......
......@@ -7,6 +7,7 @@ import android.util.Log;
import com.yottacode.net.RestapiWrapper;
import com.yottacode.net.SSLDummyContext;
import com.yottacode.net.TransactionMonitor;
import com.yottacode.pictogram.commonlibrary.R;
import com.yottacode.pictogram.action.ActionLog;
import com.yottacode.pictogram.dao.Device;
......@@ -109,7 +110,7 @@ public final class PCBcontext {
if (updatedStudent.is_picto_size_big()!=getPcbdb().getCurrentUser().is_picto_size_big()
|| updatedStudent.get_active_grid() != PCBcontext.getPcbdb().getCurrentUser().get_active_grid()) {
Log.e(LOG_TAG, "Major config modification. Restarting is mandatory");
Log.i(LOG_TAG, "Major config modification. Restarting is mandatory");
PCBcontext.getNetService().restart_app(false);
}
else {
......@@ -125,6 +126,10 @@ public final class PCBcontext {
public static void unset_user() {
Log.e(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");
TransactionMonitor.endTransaction(false);
}
pcbdb = null;
room = null;
vocabulary = null;
......
#Mon Jan 01 23:52:21 CET 2018
#Thu Jan 04 23:31:48 CET 2018
/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/drawable/abc_list_selector_holo_dark.xml=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/drawable/abc_list_selector_holo_dark.xml
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-24.2.1.aar\\d31733c6fe04e0a6f6e85ef691d61c25\\res\\drawable-xhdpi-v4\\abc_text_select_handle_middle_mtrl_light.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xhdpi-v4_abc_text_select_handle_middle_mtrl_light.png.flat
C\:\\Users\\Fernando\\.android\\build-cache\\bf155c671a1f81b39b9c63fc6de87b7e41c8ffc7\\output\\res\\drawable-mdpi-v4\\common_google_signin_btn_text_light_normal.9.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-mdpi-v4\\common_google_signin_btn_text_light_normal.9.png
......@@ -2307,21 +2307,21 @@ C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6
/home/german/pictogram/android/Pictogram/commonlibrary/build/intermediates/bundles/default/res/raw/pcbdb_create.sql=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/raw/pcbdb_create.sql
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-24.2.1.aar\\d31733c6fe04e0a6f6e85ef691d61c25\\res\\drawable-xhdpi-v4\\abc_text_select_handle_left_mtrl_light.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xhdpi-v4_abc_text_select_handle_left_mtrl_light.png.flat
C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\tabletlibrary\\build\\intermediates\\bundles\\debug\\res\\drawable-mdpi-v4\\remove_picto_from_tape.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-mdpi-v4_remove_picto_from_tape.png.flat
C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\drawable-hdpi-v4\\abc_text_select_handle_middle_mtrl_dark.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\abc_text_select_handle_middle_mtrl_dark.png
C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\tabletlibrary\\build\\intermediates\\bundles\\default\\res\\layout\\picto_grid_item.xml=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\layout\\picto_grid_item.xml
C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\drawable-hdpi-v4\\abc_text_select_handle_middle_mtrl_dark.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\abc_text_select_handle_middle_mtrl_dark.png
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-24.2.1.aar\\d31733c6fe04e0a6f6e85ef691d61c25\\res\\layout\\notification_template_lines.xml=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\layout_notification_template_lines.xml.flat
C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\drawable-xhdpi-v4\\abc_popup_background_mtrl_mult.9.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xhdpi-v4\\abc_popup_background_mtrl_mult.9.png
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-9.2.1.aar\\81280c0c9d3e6e08939985a26403968d\\res\\drawable-tvdpi-v4\\common_plus_signin_btn_icon_light_pressed.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-tvdpi-v4_common_plus_signin_btn_icon_light_pressed.9.png.flat
C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\drawable-xhdpi-v4\\abc_popup_background_mtrl_mult.9.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xhdpi-v4\\abc_popup_background_mtrl_mult.9.png
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-9.2.1.aar\\81280c0c9d3e6e08939985a26403968d\\res\\drawable-xhdpi-v4\\common_plus_signin_btn_text_dark_normal.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xhdpi-v4_common_plus_signin_btn_text_dark_normal.9.png.flat
C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\src\\main\\res\\drawable\\emptyvocab.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable\\emptyvocab.png
C\:\\Users\\Fernando\\.android\\build-cache\\bf155c671a1f81b39b9c63fc6de87b7e41c8ffc7\\output\\res\\drawable-tvdpi-v4\\common_plus_signin_btn_text_light_focused.9.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-tvdpi-v4\\common_plus_signin_btn_text_light_focused.9.png
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable\\abc_list_selector_holo_dark.xml=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable\\abc_list_selector_holo_dark.xml
C\:\\Users\\Fernando\\.android\\build-cache\\bf155c671a1f81b39b9c63fc6de87b7e41c8ffc7\\output\\res\\drawable-tvdpi-v4\\common_plus_signin_btn_text_light_focused.9.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-tvdpi-v4\\common_plus_signin_btn_text_light_focused.9.png
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-24.2.1.aar\\d31733c6fe04e0a6f6e85ef691d61c25\\res\\drawable-mdpi-v4\\abc_textfield_default_mtrl_alpha.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-mdpi-v4_abc_textfield_default_mtrl_alpha.9.png.flat
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable\\abc_list_selector_background_transition_holo_light.xml=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable\\abc_list_selector_background_transition_holo_light.xml
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-24.2.1.aar\\d31733c6fe04e0a6f6e85ef691d61c25\\res\\drawable-xhdpi-v4\\abc_textfield_search_default_mtrl_alpha.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xhdpi-v4_abc_textfield_search_default_mtrl_alpha.9.png.flat
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable-hdpi-v4\\abc_switch_track_mtrl_alpha.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\abc_switch_track_mtrl_alpha.9.png
/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/layout/abc_search_dropdown_item_icons_2line.xml=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/layout/abc_search_dropdown_item_icons_2line.xml
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable-hdpi-v4\\abc_switch_track_mtrl_alpha.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\abc_switch_track_mtrl_alpha.9.png
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable-hdpi-v4\\abc_ic_commit_search_api_mtrl_alpha.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\abc_ic_commit_search_api_mtrl_alpha.png
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-24.2.1.aar\\d31733c6fe04e0a6f6e85ef691d61c25\\res\\drawable\\abc_cab_background_top_material.xml=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable_abc_cab_background_top_material.xml.flat
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-24.2.1.aar\\d31733c6fe04e0a6f6e85ef691d61c25\\res\\anim\\abc_popup_exit.xml=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\anim_abc_popup_exit.xml.flat
......@@ -2342,25 +2342,25 @@ C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-24.
C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\tabletlibrary\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\show_categories_grid.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\show_categories_grid.png
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-24.2.1.aar\\d31733c6fe04e0a6f6e85ef691d61c25\\res\\drawable-xxhdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xxhdpi-v4_abc_btn_switch_to_on_mtrl_00012.9.png.flat
C\:\\Users\\Fernando\\.android\\build-cache\\bf155c671a1f81b39b9c63fc6de87b7e41c8ffc7\\output\\res\\drawable-tvdpi-v4\\common_plus_signin_btn_icon_light_pressed.9.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-tvdpi-v4\\common_plus_signin_btn_icon_light_pressed.9.png
C\:\\Users\\Fernando\\.android\\build-cache\\bf155c671a1f81b39b9c63fc6de87b7e41c8ffc7\\output\\res\\drawable-tvdpi-v4\\common_plus_signin_btn_text_dark_focused.9.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-tvdpi-v4\\common_plus_signin_btn_text_dark_focused.9.png
C\:\\Users\\Fernando\\.android\\build-cache\\ec4093cf65ab9cd31d72418eab5ddabdcef016f4\\output\\res\\drawable-mdpi-v4\\common_plus_signin_btn_text_light_pressed.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-mdpi-v4\\common_plus_signin_btn_text_light_pressed.9.png
C\:\\Users\\Fernando\\.android\\build-cache\\ec4093cf65ab9cd31d72418eab5ddabdcef016f4\\output\\res\\drawable-hdpi-v4\\common_plus_signin_btn_text_light_disabled.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\common_plus_signin_btn_text_light_disabled.9.png
C\:\\Users\\Fernando\\.android\\build-cache\\bf155c671a1f81b39b9c63fc6de87b7e41c8ffc7\\output\\res\\drawable-tvdpi-v4\\common_plus_signin_btn_text_dark_focused.9.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-tvdpi-v4\\common_plus_signin_btn_text_dark_focused.9.png
/home/german/pictogram/android/Pictogram/tabletlibrary/build/intermediates/bundles/default/res/drawable-hdpi-v4/edit.png=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/drawable-hdpi-v4/edit.png
C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\drawable-mdpi-v4\\abc_list_pressed_holo_dark.9.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-mdpi-v4\\abc_list_pressed_holo_dark.9.png
C\:\\Users\\Fernando\\.android\\build-cache\\ec4093cf65ab9cd31d72418eab5ddabdcef016f4\\output\\res\\drawable-hdpi-v4\\common_plus_signin_btn_text_light_disabled.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\common_plus_signin_btn_text_light_disabled.9.png
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-24.2.1.aar\\d31733c6fe04e0a6f6e85ef691d61c25\\res\\drawable-mdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-mdpi-v4_abc_textfield_search_activated_mtrl_alpha.9.png.flat
C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\drawable-mdpi-v4\\abc_list_pressed_holo_dark.9.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-mdpi-v4\\abc_list_pressed_holo_dark.9.png
C\:\\Users\\Fernando\\.android\\build-cache\\ec4093cf65ab9cd31d72418eab5ddabdcef016f4\\output\\res\\drawable-xxhdpi-v4\\common_plus_signin_btn_text_light_normal.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xxhdpi-v4\\common_plus_signin_btn_text_light_normal.9.png
/home/german/pictogram/android/Pictogram/tabletlibrary/build/intermediates/bundles/default/res/drawable/edit_text_login_style.xml=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/drawable/edit_text_login_style.xml
/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/drawable-hdpi-v4/abc_scrubber_control_to_pressed_mtrl_005.png=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/drawable-hdpi-v4/abc_scrubber_control_to_pressed_mtrl_005.png
C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\tabletlibrary\\build\\intermediates\\bundles\\debug\\res\\anim\\rightout.xml=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\anim_rightout.xml.flat
C\:\\Users\\Fernando\\.android\\build-cache\\bf155c671a1f81b39b9c63fc6de87b7e41c8ffc7\\output\\res\\drawable-hdpi-v4\\common_plus_signin_btn_text_light_pressed.9.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\common_plus_signin_btn_text_light_pressed.9.png
/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/drawable-hdpi-v4/abc_ic_menu_cut_mtrl_alpha.png=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/drawable-hdpi-v4/abc_ic_menu_cut_mtrl_alpha.png
C\:\\Users\\Fernando\\.android\\build-cache\\bf155c671a1f81b39b9c63fc6de87b7e41c8ffc7\\output\\res\\drawable-hdpi-v4\\common_plus_signin_btn_text_light_pressed.9.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\common_plus_signin_btn_text_light_pressed.9.png
C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\tabletlibrary\\build\\intermediates\\bundles\\debug\\res\\anim\\rightout.xml=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\anim_rightout.xml.flat
C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\drawable-hdpi-v4\\abc_ic_commit_search_api_mtrl_alpha.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\abc_ic_commit_search_api_mtrl_alpha.png
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-9.2.1.aar\\81280c0c9d3e6e08939985a26403968d\\res\\drawable-xxhdpi-v4\\common_google_signin_btn_text_dark_disabled.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xxhdpi-v4_common_google_signin_btn_text_dark_disabled.9.png.flat
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable\\abc_ratingbar_indicator_material.xml=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable\\abc_ratingbar_indicator_material.xml
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-9.2.1.aar\\81280c0c9d3e6e08939985a26403968d\\res\\drawable-hdpi-v4\\common_plus_signin_btn_text_light_normal.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4_common_plus_signin_btn_text_light_normal.9.png.flat
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable-xhdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xhdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png
/home/german/.android/build-cache/f0c2cad8882db88126b8f91b1b8a02b75344c6d4/output/res/drawable-tvdpi-v4/common_google_signin_btn_text_light_pressed.9.png=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/drawable-tvdpi-v4/common_google_signin_btn_text_light_pressed.9.png
C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\drawable-hdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png
/home/german/.android/build-cache/f0c2cad8882db88126b8f91b1b8a02b75344c6d4/output/res/drawable-tvdpi-v4/common_google_signin_btn_text_light_pressed.9.png=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/drawable-tvdpi-v4/common_google_signin_btn_text_light_pressed.9.png
C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\drawable-hdpi-v4\\abc_text_select_handle_left_mtrl_light.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\abc_text_select_handle_left_mtrl_light.png
C\:\\Users\\Fernando\\.android\\build-cache\\ec4093cf65ab9cd31d72418eab5ddabdcef016f4\\output\\res\\drawable-mdpi-v4\\common_google_signin_btn_text_dark_disabled.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-mdpi-v4\\common_google_signin_btn_text_dark_disabled.9.png
C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\drawable-xhdpi-v4\\abc_text_select_handle_left_mtrl_light.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xhdpi-v4\\abc_text_select_handle_left_mtrl_light.png
......@@ -2368,18 +2368,18 @@ C\:\\Users\\Fernando\\.android\\build-cache\\bf155c671a1f81b39b9c63fc6de87b7e41c
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-24.2.1.aar\\d31733c6fe04e0a6f6e85ef691d61c25\\res\\layout\\notification_template_media.xml=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\layout_notification_template_media.xml.flat
C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\tabletlibrary\\build\\intermediates\\bundles\\default\\res\\mipmap-hdpi-v4\\ic_launcher.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\mipmap-hdpi-v4\\ic_launcher.png
C\:\\Users\\Fernando\\.android\\build-cache\\ec4093cf65ab9cd31d72418eab5ddabdcef016f4\\output\\res\\drawable-tvdpi-v4\\common_google_signin_btn_icon_light_disabled.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-tvdpi-v4\\common_google_signin_btn_icon_light_disabled.9.png
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-24.2.1.aar\\d31733c6fe04e0a6f6e85ef691d61c25\\res\\drawable\\abc_ratingbar_indicator_material.xml=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable_abc_ratingbar_indicator_material.xml.flat
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_star_half_black_48dp.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xxxhdpi-v4\\abc_ic_star_half_black_48dp.png
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-24.2.1.aar\\d31733c6fe04e0a6f6e85ef691d61c25\\res\\drawable\\abc_ratingbar_indicator_material.xml=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable_abc_ratingbar_indicator_material.xml.flat
/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/drawable-v21/abc_edit_text_material.xml=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/drawable-v21/abc_edit_text_material.xml
/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/drawable-xxxhdpi-v4/abc_ic_star_black_36dp.png=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/drawable-xxxhdpi-v4/abc_ic_star_black_36dp.png
C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\drawable-hdpi-v4\\abc_scrubber_track_mtrl_alpha.9.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\abc_scrubber_track_mtrl_alpha.9.png
C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\drawable-xhdpi-v4\\abc_ic_commit_search_api_mtrl_alpha.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xhdpi-v4\\abc_ic_commit_search_api_mtrl_alpha.png
/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/color-v23/abc_tint_seek_thumb.xml=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/color-v23/abc_tint_seek_thumb.xml
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-24.2.1.aar\\d31733c6fe04e0a6f6e85ef691d61c25\\res\\drawable\\abc_btn_borderless_material.xml=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable_abc_btn_borderless_material.xml.flat
/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/drawable-mdpi-v4/abc_scrubber_primary_mtrl_alpha.9.png=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/drawable-mdpi-v4/abc_scrubber_primary_mtrl_alpha.9.png
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-9.2.1.aar\\81280c0c9d3e6e08939985a26403968d\\res\\drawable-mdpi-v4\\common_google_signin_btn_text_light_normal.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-mdpi-v4_common_google_signin_btn_text_light_normal.9.png.flat
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable-xxxhdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xxxhdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png
/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/drawable-mdpi-v4/abc_scrubber_primary_mtrl_alpha.9.png=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/drawable-mdpi-v4/abc_scrubber_primary_mtrl_alpha.9.png
C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\tabletlibrary\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\show_categories_grid.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4_show_categories_grid.png.flat
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable-xxxhdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xxxhdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png
C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\tabletlibrary\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\yottacode_logo.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xhdpi-v4\\yottacode_logo.png
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable-hdpi-v4\\abc_scrubber_control_off_mtrl_alpha.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\abc_scrubber_control_off_mtrl_alpha.png
/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/drawable-xxxhdpi-v4/abc_text_select_handle_left_mtrl_dark.png=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/drawable-xxxhdpi-v4/abc_text_select_handle_left_mtrl_dark.png
......@@ -2389,39 +2389,39 @@ C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-24.2.1.aar\\d31733c6fe04e0a6f6e85ef691d61c25\\res\\drawable-xxhdpi-v4\\abc_textfield_default_mtrl_alpha.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xxhdpi-v4_abc_textfield_default_mtrl_alpha.9.png.flat
/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/drawable-xhdpi-v4/abc_btn_radio_to_on_mtrl_000.png=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/drawable-xhdpi-v4/abc_btn_radio_to_on_mtrl_000.png
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable-hdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-9.2.1.aar\\81280c0c9d3e6e08939985a26403968d\\res\\drawable-xhdpi-v4\\common_google_signin_btn_icon_dark_focused.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xhdpi-v4_common_google_signin_btn_icon_dark_focused.9.png.flat
/home/german/pictogram/android/Pictogram/tabletlibrary/build/intermediates/bundles/default/res/layout/dialog_change_escape_code.xml=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/layout/dialog_change_escape_code.xml
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-9.2.1.aar\\81280c0c9d3e6e08939985a26403968d\\res\\drawable-xhdpi-v4\\common_google_signin_btn_icon_dark_focused.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xhdpi-v4_common_google_signin_btn_icon_dark_focused.9.png.flat
/home/german/.android/build-cache/f0c2cad8882db88126b8f91b1b8a02b75344c6d4/output/res/drawable-xhdpi-v4/common_google_signin_btn_text_light_pressed.9.png=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/drawable-xhdpi-v4/common_google_signin_btn_text_light_pressed.9.png
/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/drawable-xhdpi-v4/abc_popup_background_mtrl_mult.9.png=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/drawable-xhdpi-v4/abc_popup_background_mtrl_mult.9.png
C\:\\Users\\Fernando\\.android\\build-cache\\bf155c671a1f81b39b9c63fc6de87b7e41c8ffc7\\output\\res\\drawable-tvdpi-v4\\common_google_signin_btn_icon_light_focused.9.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-tvdpi-v4\\common_google_signin_btn_icon_light_focused.9.png
C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\tabletlibrary\\build\\intermediates\\bundles\\default\\res\\drawable\\round_design_photo_white.xml=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable\\round_design_photo_white.xml
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-9.2.1.aar\\81280c0c9d3e6e08939985a26403968d\\res\\drawable-xhdpi-v4\\common_plus_signin_btn_icon_light_pressed.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xhdpi-v4_common_plus_signin_btn_icon_light_pressed.9.png.flat
/home/german/pictogram/android/Pictogram/tabletlibrary/build/intermediates/bundles/default/res/menu/menu_splash_screen.xml=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/menu/menu_splash_screen.xml
C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\drawable-hdpi-v4\\abc_list_pressed_holo_light.9.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\abc_list_pressed_holo_light.9.png
C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\tabletlibrary\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\descarga.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\descarga.png
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable-xhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png
C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\drawable-hdpi-v4\\abc_list_pressed_holo_light.9.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\abc_list_pressed_holo_light.9.png
/home/german/pictogram/android/Pictogram/tabletlibrary/build/intermediates/bundles/default/res/menu/menu_splash_screen.xml=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/menu/menu_splash_screen.xml
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable-xxhdpi-v4\\abc_ab_share_pack_mtrl_alpha.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xxhdpi-v4\\abc_ab_share_pack_mtrl_alpha.9.png
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable-xhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png
/home/german/pictogram/android/Pictogram/tabletlibrary/build/intermediates/bundles/default/res/menu/menu_login_activity.xml=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/menu/menu_login_activity.xml
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable-hdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png
C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\color-v23\\abc_btn_colored_borderless_text_material.xml=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\color-v23\\abc_btn_colored_borderless_text_material.xml
/home/german/.android/build-cache/f0c2cad8882db88126b8f91b1b8a02b75344c6d4/output/res/drawable-tvdpi-v4/common_plus_signin_btn_text_dark_disabled.9.png=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/drawable-tvdpi-v4/common_plus_signin_btn_text_dark_disabled.9.png
C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\color-v23\\abc_btn_colored_borderless_text_material.xml=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\color-v23\\abc_btn_colored_borderless_text_material.xml
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-24.2.1.aar\\d31733c6fe04e0a6f6e85ef691d61c25\\res\\layout\\abc_list_menu_item_icon.xml=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\layout_abc_list_menu_item_icon.xml.flat
C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\tabletlibrary\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\anonymous_student.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\anonymous_student.png
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable-hdpi-v4\\abc_text_select_handle_right_mtrl_dark.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\abc_text_select_handle_right_mtrl_dark.png
C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\tabletlibrary\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\session_talk.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4_session_talk.png.flat
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-24.2.1.aar\\d31733c6fe04e0a6f6e85ef691d61c25\\res\\drawable-xhdpi-v4\\abc_list_longpressed_holo.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xhdpi-v4_abc_list_longpressed_holo.9.png.flat
C\:\\Users\\Fernando\\.android\\build-cache\\bf155c671a1f81b39b9c63fc6de87b7e41c8ffc7\\output\\res\\drawable-hdpi-v4\\common_plus_signin_btn_text_dark_pressed.9.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\common_plus_signin_btn_text_dark_pressed.9.png
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-24.2.1.aar\\d31733c6fe04e0a6f6e85ef691d61c25\\res\\drawable-xxhdpi-v4\\abc_switch_track_mtrl_alpha.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xxhdpi-v4_abc_switch_track_mtrl_alpha.9.png.flat
C\:\\Users\\Fernando\\.android\\build-cache\\bf155c671a1f81b39b9c63fc6de87b7e41c8ffc7\\output\\res\\drawable-hdpi-v4\\common_plus_signin_btn_text_dark_pressed.9.png=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4\\common_plus_signin_btn_text_dark_pressed.9.png
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable\\abc_btn_default_mtrl_shape.xml=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable\\abc_btn_default_mtrl_shape.xml
C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\tabletlibrary\\build\\intermediates\\bundles\\default\\res\\menu\\menu_login_activity.xml=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\menu\\menu_login_activity.xml
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable-xhdpi-v4\\abc_ic_star_half_black_48dp.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xhdpi-v4\\abc_ic_star_half_black_48dp.png
C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\tabletlibrary\\build\\intermediates\\bundles\\default\\res\\menu\\menu_login_activity.xml=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\menu\\menu_login_activity.xml
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-9.2.1.aar\\81280c0c9d3e6e08939985a26403968d\\res\\drawable-hdpi-v4\\common_google_signin_btn_text_light_disabled.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-hdpi-v4_common_google_signin_btn_text_light_disabled.9.png.flat
C\:\\Users\\Fernando\\.android\\build-cache\\ec4093cf65ab9cd31d72418eab5ddabdcef016f4\\output\\res\\drawable-xxhdpi-v4\\common_google_signin_btn_icon_dark_disabled.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xxhdpi-v4\\common_google_signin_btn_icon_dark_disabled.9.png
C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\tabletlibrary\\build\\intermediates\\bundles\\debug\\res\\menu\\menu_login_activity.xml=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\menu_menu_login_activity.xml.flat
C\:\\Users\\Fernando\\.android\\build-cache\\ec4093cf65ab9cd31d72418eab5ddabdcef016f4\\output\\res\\drawable-xxhdpi-v4\\common_google_signin_btn_icon_dark_disabled.9.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xxhdpi-v4\\common_google_signin_btn_icon_dark_disabled.9.png
C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\color\\abc_secondary_text_material_light.xml=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\color\\abc_secondary_text_material_light.xml
C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\drawable-v21\\abc_edit_text_material.xml=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-v21\\abc_edit_text_material.xml
C\:\\Users\\Fernando\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-24.2.1.aar\\d31733c6fe04e0a6f6e85ef691d61c25\\res\\drawable-xxxhdpi-v4\\abc_btn_check_to_on_mtrl_000.png=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-xxxhdpi-v4_abc_btn_check_to_on_mtrl_000.png.flat
C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\drawable-v21\\abc_edit_text_material.xml=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable-v21\\abc_edit_text_material.xml
C\:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\drawable\\abc_seekbar_track_material.xml=C\:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\drawable\\abc_seekbar_track_material.xml
/home/german/.android/build-cache/f0c2cad8882db88126b8f91b1b8a02b75344c6d4/output/res/drawable-xxhdpi-v4/common_google_signin_btn_text_dark_pressed.9.png=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/drawable-xxhdpi-v4/common_google_signin_btn_text_dark_pressed.9.png
/home/german/pictogram/android/Pictogram/tabletlibrary/build/intermediates/bundles/default/res/drawable-hdpi-v4/unlock.png=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/drawable-hdpi-v4/unlock.png
/home/german/.android/build-cache/f0c2cad8882db88126b8f91b1b8a02b75344c6d4/output/res/drawable-xxhdpi-v4/common_google_signin_btn_text_dark_pressed.9.png=/home/german/pictogram/android/Pictogram/communicator/build/intermediates/res/merged/DevFlavor/debug/drawable-xxhdpi-v4/common_google_signin_btn_text_dark_pressed.9.png
C\:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\layout\\abc_expanded_menu_layout.xml=C\:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\res\\merged\\DevFlavor\\debug\\layout\\abc_expanded_menu_layout.xml
......@@ -258,8 +258,20 @@ public class VocabularyManager extends Activity implements VocabularyTalk.iVocab
PCBcontext.getNetService().restart_app(false);
}
});
((NetServiceTablet)PCBcontext.getNetService().getNetServiceDevice()).setInternetConnectionListener(new NetServiceTablet.iInternetConnectionListener() {
@Override
public void update(final boolean online) {
runOnUiThread(new Runnable() {
@Override
public void run() {
((ImageView) findViewById(R.id.imageConnectionOnOff)).setImageDrawable(online ? getDrawable(R.drawable.application_online) : getDrawable(R.drawable.application_offline));
}
});
}
});
}
@Override
protected void onResume() {
......
......@@ -15,6 +15,7 @@ import android.widget.TextView;
import com.yottacode.pictogram.net.ImgDownloader;
import com.yottacode.pictogram.supervisor.R;
import com.yottacode.pictogram.tabletlibrary.net.NetServiceTablet;
import com.yottacode.pictogram.tools.Img;
import com.yottacode.pictogram.tools.PCBcontext;
import com.yottacode.tools.GUITools;
......@@ -58,6 +59,19 @@ public class LoginActivity extends FragmentActivity {
startActivity(serialActivity);
}
});
((NetServiceTablet)PCBcontext.getNetService().getNetServiceDevice()).setInternetConnectionListener(new NetServiceTablet.iInternetConnectionListener() {
@Override
public void update(final boolean online) {
runOnUiThread(new Runnable() {
@Override
public void run() {
((ImageView) findViewById(R.id.imageConnectionOnOff_login)).setImageDrawable(online ? getDrawable(R.drawable.application_online) : getDrawable(R.drawable.application_offline));
}
});
}
});
}
@Override
......
......@@ -41,7 +41,13 @@
android:textColor="@color/BlancoApp" />
</LinearLayout>
<ImageView
android:id="@+id/imageConnectionOnOff_login"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_toLeftOf="@+id/loginTopbarLogout"
android:layout_centerVertical="true"
android:src="@drawable/application_online" />
<Button
android:id="@+id/loginTopbarLogout"
style="@android:style/Widget.Holo.Light.Button"
......
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -50,7 +51,13 @@
android:textColor="@color/BlancoApp" />
</LinearLayout>
<ImageView
android:id="@+id/imageConnectionOnOff"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_toLeftOf="@+id/vmTopbarToUserListBtn"
android:layout_alignParentTop="true"
android:src="@drawable/application_online" />
<Button
android:id="@+id/vmTopbarToUserListBtn"
style="@android:style/Widget.Holo.Light.Button"
......@@ -105,13 +112,6 @@
</RelativeLayout>
<FrameLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:orientation="horizontal">
</FrameLayout>
</FrameLayout>
......@@ -50,7 +50,13 @@
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
<ImageView
android:id="@+id/imageConnectionOnOff"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_toLeftOf="@+id/vmTopbarToUserListBtn"
android:layout_centerVertical="true"
android:src="@drawable/application_online" />
<Button
android:id="@+id/vmTopbarToUserListBtn"
style="@android:style/Widget.Holo.Light.Button"
......
......@@ -137,12 +137,12 @@ public class SerialActivity extends Activity {
editor.putString("username", username);
editor.putString("password", password);
editor.commit();
if (!username.equals("") && !password.equals(""))
/*if (!username.equals("") && !password.equals(""))
try {
new UserLogin().login(username, password, SerialActivity.this, Class.forName(getString(R.string.activityAfterLogin)));
} catch (ClassNotFoundException e) {
Log.e(LOG_TAG,e.toString());
}
}*/
}
});
......
......@@ -22,12 +22,16 @@ import com.yottacode.pictogram.tools.PCBcontext;
*/
public class NetServiceTablet implements NetService.iNetServiceDevice {
public interface iInternetConnectionListener {
public void update(boolean online);
}
private static final String LOG_TAG = NetServiceTablet.class.getName();
private static NotificationCompat.Builder builder;
private VOCA VOCA;
int notifyID = 666;
private iInternetConnectionListener internetConnectionListener=null;
public void setInternetConnectionListener(iInternetConnectionListener listener) {this.internetConnectionListener=listener;}
public void build() {
this.builder = new NotificationCompat.Builder(PCBcontext.getContext()).setAutoCancel(true).setOngoing(PCBcontext.getContext().getResources().getBoolean(R.bool.NotifyAllwaysVisible));
......@@ -66,6 +70,8 @@ public class NetServiceTablet implements NetService.iNetServiceDevice {
(NotificationManager) PCBcontext.getContext().getSystemService(PCBcontext.getContext().NOTIFICATION_SERVICE);
mNotificationManager.notify(notifyID, builder.build());
}
if (internetConnectionListener!=null)
internetConnectionListener.update(updated);
}
public void closeNotifyStatus(){
NotificationManager mNotificationManager =
......
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