Refactorización a Pictogram Communicator y Pictogram Supervisor

android/Pictogram/.gitignore

@@ -52,10 +52,10 @@ src/main/assets/core_vocabulary/57236.png
 src/main/assets/core_vocabulary/57384.png
 src/main/createdoc.bat
 src/main/resources/
-yotta_tablet/yotta_tablet.iml
-commonlibrary/commonlibrary.iml
-supervisor_tablet/supervisor_tablet.iml
+communicator/yotta_tablet.iml
 commonlibrary/commonlibrary.iml
+supervisor/supervisor_tablet.iml
+
 
 watch/watch.iml
 app
@@ -65,19 +65,23 @@ gen/
 /Pictogram.iml
 /.gitignore
 !/tabletlibrary/tabletlibrary.iml
-supervisor_tablet/src/main/res/drawable-xhdpi/
-supervisor_tablet/src/main/res/drawable-xxhdpi/
-supervisor_tablet/src/main/res/drawable-xxxhdpi/
+supervisor/src/main/res/drawable-xhdpi/
+supervisor/src/main/res/drawable-xxhdpi/
+supervisor/src/main/res/drawable-xxxhdpi/
 tabletlibrary/libs/
 tabletlibrary/src/main/res/anim/slide_in.xml
 tabletlibrary/src/main/res/anim/slide_out.xml
 tabletlibrary/src/main/res/drawable-hdpi/descarga.png
 tabletlibrary/src/main/res/drawable-hdpi/flash.png
 tabletlibrary/src/main/res/drawable-hdpi/session_talk.png
-yotta_tablet/src/main/res/drawable-hdpi/
-yotta_tablet/src/main/res/drawable-xhdpi/
-yotta_tablet/src/main/res/drawable-xxhdpi/
-yotta_tablet/src/main/res/drawable-xxxhdpi/
+communicator/src/main/res/drawable-hdpi/
+communicator/src/main/res/drawable-xhdpi/
+communicator/src/main/res/drawable-xxhdpi/
+communicator/src/main/res/drawable-xxxhdpi/
 /watch/watch.iml
 /commonlibrary/commonlibrary.iml
 /tabletlibrary/tabletlibrary.iml
+communicator/.gitignore
+communicator/build.gradle
+communicator/communicator.iml
+communicator/proguard-rules.pro

android/Pictogram/commonlibrary/build.gradle

 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 24
     buildToolsVersion '25.0.0'
 
     defaultConfig {
@@ -41,8 +41,8 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:support-v4:21.1.1'
-    compile 'com.android.support:appcompat-v7:21.0.+'
+    compile 'com.android.support:support-v4:24.2.1'
+    compile 'com.android.support:appcompat-v7:24.2.1'
     compile 'com.github.nkzawa:socket.io-client:0.5.0'
     compile 'com.koushikdutta.async:androidasync:2.+'
     compile 'com.koushikdutta.ion:ion:2.+'

android/Pictogram/commonlibrary/src/main/res/values-en/strings.xml

@@ -85,7 +85,7 @@
     <string name="fa_exclamation_triangle">&#xf071;</string>
     <string name="fa_user_plus">&#xf234;</string>
     <string name="fa_question_circle">&#xf059;</string>
-    <string name="google_play_student_apk">https://play.google.com/store/apps/details?id=com.yottacode.yotta_tablet</string>
-    <string name="google_play_supervisor_apk">https://play.google.com/store/apps/details?id=com.yottacode.supervisor_tablet</string>
+    <string name="google_play_student_apk">https://play.google.com/store/apps/details?id=com.yottacode.communicator</string>
+    <string name="google_play_supervisor_apk">https://play.google.com/store/apps/details?id=com.yottacode.supervisor</string>
 
 </resources>

android/Pictogram/commonlibrary/src/main/res/values-es/strings.xml

@@ -80,7 +80,7 @@
     <string name="fa_exclamation_triangle">&#xf071;</string>
     <string name="fa_question_circle">&#xf059;</string>
     <string name="fa_user_plus">&#xf234;</string>
-    <string name="google_play_student_apk">https://play.google.com/store/apps/details?id=com.yottacode.yotta_tablet</string>
-    <string name="google_play_supervisor_apk">https://play.google.com/store/apps/details?id=com.yottacode.supervisor_tablet</string>
+    <string name="google_play_student_apk">https://play.google.com/store/apps/details?id=com.yottacode.communicator</string>
+    <string name="google_play_supervisor_apk">https://play.google.com/store/apps/details?id=com.yottacode.supervisor</string>
 </resources>
 

android/Pictogram/commonlibrary/src/main/res/values/strings.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Pictogram Tablet</string>
     <string name="action_settings">Parámetros</string>
     <string name="title_activity_login">Entrada de usuarios</string>
     <string name="title_activity_login_activity_fragments">Entrada de usuarios</string>
@@ -85,6 +84,6 @@
     <string name="fa_exclamation_triangle">&#xf071;</string>
     <string name="fa_user_plus">&#xf234;</string>
     <string name="fa_question_circle">&#xf059;</string>
-    <string name="google_play_student_apk">https://play.google.com/store/apps/details?id=com.yottacode.yotta_tablet</string>
-    <string name="google_play_supervisor_apk">https://play.google.com/store/apps/details?id=com.yottacode.supervisor_tablet</string>
+    <string name="google_play_student_apk">https://play.google.com/store/apps/details?id=com.yottacode.communicator</string>
+    <string name="google_play_supervisor_apk">https://play.google.com/store/apps/details?id=com.yottacode.supervisor</string>
 </resources>

android/Pictogram/yotta_tablet/src/main/AndroidManifest.xml → android/Pictogram/communicator/src/main/AndroidManifest.xml

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.yottacode.pictogram.yotta_tablet">
+    package="com.yottacode.pictogram.communicator">
 
   <!-- The app has the permission to receive the RECEIVE_BOOT_COMPLETED broadcast -->
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -21,7 +21,7 @@
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
   <uses-permission android:name="android.permission.READ_CALL_LOG" />
     <application
-        android:name=".kiosk.AppContext"
+        android:name="com.yottacode.pictogram.communicator.kiosk.AppContext"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
@@ -62,14 +62,14 @@
             android:launchMode="singleTop"
             android:screenOrientation="landscape" />
         <!-- Intent Filter to run the app when the boot is completed -->
-        <receiver android:name=".kiosk.BootReceiver">
+        <receiver android:name="com.yottacode.pictogram.communicator.kiosk.BootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
         <!-- Service for restarting the app when another app go to foreground -->
         <service
-            android:name=".kiosk.KioskService"
+            android:name="com.yottacode.pictogram.communicator.kiosk.KioskService"
             android:exported="false" />
 
         <activity

android/Pictogram/communicator/src/main/java/com/yottacode/pictogram/communicator/kiosk/AppContext.java

+package com.yottacode.pictogram.communicator.kiosk;
+
+import android.app.Application;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.PowerManager;
+
+/**
+ * Created by emblanco on 14/10/15.
+ */
+public class AppContext extends Application {
+
+    private AppContext instance;
+    private PowerManager.WakeLock wakeLock;
+    private OnScreenOffReceiver onScreenOffReceiver;
+
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        instance = this;
+        registerKioskModeScreenOffReceiver();
+        startKioskService();  // Service for restarting the app when another app go to foreground
+
+    }
+
+    private void registerKioskModeScreenOffReceiver() {
+        // register screen off receiver
+        final IntentFilter filter = new IntentFilter(Intent.ACTION_SCREEN_OFF);
+        onScreenOffReceiver = new OnScreenOffReceiver();
+        registerReceiver(onScreenOffReceiver, filter);
+    }
+
+    public PowerManager.WakeLock getWakeLock() {
+        if(wakeLock == null) {
+            // lazy loading: first call, create wakeLock via PowerManager.
+            PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+            wakeLock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP, "wakeup");
+        }
+        return wakeLock;
+    }
+
+    // Service for restarting the app when another app go to foreground
+    private void startKioskService() {
+        startService(new Intent(this, KioskService.class));
+    }
+}

android/Pictogram/yotta_tablet/src/main/java/com/yottacode/pictogram/yotta_tablet/kiosk/BootReceiver.java → android/Pictogram/communicator/src/main/java/com/yottacode/pictogram/communicator/kiosk/BootReceiver.java

-package com.yottacode.pictogram.yotta_tablet.kiosk;
+package com.yottacode.pictogram.communicator.kiosk;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

android/Pictogram/communicator/src/main/java/com/yottacode/pictogram/communicator/kiosk/KioskService.java

+package com.yottacode.pictogram.communicator.kiosk;
+
+import android.app.ActivityManager;
+import android.app.NotificationManager;
+import android.app.Service;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.IBinder;
+import android.preference.PreferenceManager;
+import android.util.Log;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Created by emblanco on 15/10/15.
+ *
+ * Since Android 4 there is no effective method to deactivate the home button.
+ * That is the reason why we need to do a little hack.
+ * In general the idea is to detect when a new application is in foreground and restart
+ * your activity immediately.
+ *
+ * The thread checks every two seconds if the app is running in foreground.
+ * If not, the thread will immediately recreate your activity.
+ *
+ */
+public class KioskService extends Service {
+
+    private static final long INTERVAL = TimeUnit.SECONDS.toMillis(2); // periodic interval to check in seconds -> 2 seconds
+    private static final String TAG = KioskService.class.getSimpleName();
+    private static final String PREF_KIOSK_MODE = "pref_kiosk_mode";
+
+    private Thread t = null;
+    private Context ctx = null;
+    private boolean running = false;
+
+    @Override
+    public void onDestroy() {
+        Log.i(TAG, "Stopping service 'KioskService'");
+        running =false;
+        NotificationManager mNotificationManager =
+            (NotificationManager)this.getBaseContext().getSystemService(this.getBaseContext().NOTIFICATION_SERVICE);
+        mNotificationManager.cancel(666);
+        super.onDestroy();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        Log.i(TAG, "Starting service 'KioskService'");
+        running = true;
+        ctx = this;
+
+        // start a thread that periodically checks if your app is in the foreground
+        t = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                do {
+                    handleKioskMode();
+                    try {
+                        Thread.sleep(INTERVAL);
+                    } catch (InterruptedException e) {
+                        Log.i(TAG, "Thread interrupted: 'KioskService'");
+                    }
+                }while(running);
+                stopSelf();
+            }
+        });
+
+        t.start();
+        return Service.START_NOT_STICKY;
+    }
+
+    private void handleKioskMode() {
+        // is Kiosk Mode active?
+        if(isKioskModeActive(this)) {
+            // is App in background?
+            if(isInBackground()) {
+                restoreApp(); // restore!
+            }
+        }
+    }
+
+    private boolean isInBackground() {
+        ActivityManager am = (ActivityManager) ctx.getSystemService(Context.ACTIVITY_SERVICE);
+
+        List<ActivityManager.RunningTaskInfo> taskInfo = am.getRunningTasks(1);
+        ComponentName componentInfo = taskInfo.get(0).topActivity;
+        return (!ctx.getApplicationContext().getPackageName().equals(componentInfo.getPackageName()));
+    }
+
+    private void restoreApp() {
+        // Restart activity
+        Intent i = new Intent(ctx, com.yottacode.pictogram.tabletlibrary.gui.login.SerialActivity.class);
+        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        ctx.startActivity(i);
+    }
+
+    public boolean isKioskModeActive(final Context context) {
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+        return sp.getBoolean(PREF_KIOSK_MODE, false);
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+}

android/Pictogram/communicator/src/main/java/com/yottacode/pictogram/communicator/kiosk/OnScreenOffReceiver.java

+package com.yottacode.pictogram.communicator.kiosk;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.PowerManager;
+import android.preference.PreferenceManager;
+
+/**
+ * Created by emblanco on 14/10/15.
+ *
+ *
+ Short power button press:
+
+ It can detect a short button press by handling the ACTION_SCREEN_OFF intent and kick the screen
+ back to life with acquiring a wake lock.
+ *
+ *
+ *
+ */
+public class OnScreenOffReceiver extends BroadcastReceiver {
+    private static final String PREF_KIOSK_MODE = "pref_kiosk_mode";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if(Intent.ACTION_SCREEN_OFF.equals(intent.getAction())){
+            AppContext ctx = (AppContext) context.getApplicationContext();
+            // is Kiosk Mode active?
+            if(isKioskModeActive(ctx)) {
+                wakeUpDevice(ctx);
+            }
+        }
+    }
+
+    private void wakeUpDevice(AppContext context) {
+        PowerManager.WakeLock wakeLock = context.getWakeLock(); // get WakeLock reference via AppContext
+        if (wakeLock.isHeld()) {
+            wakeLock.release(); // release old wake lock
+        }
+
+        // create a new wake lock...
+        wakeLock.acquire();
+
+        // ... and release again
+        wakeLock.release();
+    }
+
+    private boolean isKioskModeActive(final Context context) {
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+        return sp.getBoolean(PREF_KIOSK_MODE, false);
+    }
+}

android/Pictogram/communicator/src/main/java/com/yottacode/pictogram/communicator/net/VersionManager.java

+package com.yottacode.pictogram.communicator.net;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.text.SpannableString;
+import android.text.method.LinkMovementMethod;
+import android.text.util.Linkify;
+import android.view.KeyEvent;
+import android.widget.TextView;
+
+import com.yottacode.pictogram.dao.DeviceHelper;
+import com.yottacode.pictogram.net.iVersionManager;
+import com.yottacode.pictogram.tools.PCBcontext;
+import com.yottacode.pictogram.communicator.R;
+
+import static android.app.Activity.RESULT_OK;
+
+/**
+ * Created by Fernando on 10/03/2017.
+ */
+
+public class VersionManager implements iVersionManager {
+    static final String LOG_TAG=VersionManager.class.getCanonicalName();
+
+    public void newVersionAlert(final float version, final Context context, final float vnew) {
+
+        final SpannableString s = new SpannableString(context.getResources().getString(R.string.google_play_student_apk));
+
+        final TextView tx1 = new TextView(context);
+        tx1.setText("\t"+context.getResources().getString(R.string.new_version_detail) +
+            "\n\t\t"+ s);
+        tx1.setTextSize(16);
+        tx1.setAutoLinkMask(RESULT_OK);
+        tx1.setMovementMethod(LinkMovementMethod.getInstance());
+
+        Linkify.addLinks(s, Linkify.WEB_URLS);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        builder.setTitle(context.getResources().getString(R.string.app_name)+": "+context.getResources().getString(R.string.new_version_title)+" v"+vnew)
+            .setCancelable(false)
+            .setPositiveButton("OK",
+                new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog,
+                                        int id) {
+                        DeviceHelper.setAppVersion(vnew);
+                    }
+                })
+
+            .setView(tx1).setOnKeyListener(new DialogInterface.OnKeyListener() {
+            @Override
+            public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
+
+                return false;
+            }
+        }).show();
+        PCBcontext.setActivityContext(null);
+
+    }
+
+    /*
+    public void newVersionAlert(final float version, final Context context, final float vnew) {
+        GUITools.show_alert(
+            PCBcontext.getActivityContext(), R.string.new_version_title,
+            PCBcontext.getContext().getResources().getString(R.string.new_version_detail)+" v" + version, new GUITools.iOKListener() {
+                @Override
+                public void ok() {
+                    downloadNewVersion(version,PCBcontext.getActivityContext(), version);
+                }
+            });
+    }
+    private void downloadNewVersion(final float version, final Context context, final float vnew) {
+        final ProgressDialog progressDialog=ProgressDialog.show(context, context.getString(R.string.userLoadingTxt),context.getString(R.string.new_version_downloading));
+        progressDialog.show();
+        String destination = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + "/";
+        String fileName = context.getResources().getString(com.yottacode.pictogram.R.string.apk);
+        String apkurl=context.getResources().getString(com.yottacode.pictogram.R.string.server);
+        apkurl="https://pre.yottacode.com"
+            + "/" + fileName;
+        destination += fileName;
+        final Uri uri = Uri.parse("file://" + destination);
+        Log.i(LOG_TAG,"Downloading new version from "+apkurl+" to "+destination);
+        //Delete update file if exists
+        File file = new File(destination);
+        if (file.exists())
+            file.delete();
+
+        //set downloadmanager
+        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(apkurl));
+        request.setDescription(context.getString(R.string.new_version_detail));
+        request.setTitle(context.getString(com.yottacode.pictogram.R.string.app_name));
+
+        //set destination
+        request.setDestinationUri(uri);
+
+        // get download service and enqueue file
+        final DownloadManager manager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
+        final long downloadId = manager.enqueue(request);
+
+
+        //register receiver for when .apk download is complete
+        context.registerReceiver(new BroadcastReceiver() {
+                                     public void onReceive(Context ctxt, Intent intent) {
+                                         progressDialog.dismiss();
+                                         Intent install = new Intent(Intent.ACTION_VIEW);
+                                         install.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                                         install.setDataAndType(uri,
+                                             manager.getMimeTypeForDownloadedFile(downloadId));
+                                         context.startActivity(install);
+                                         context.unregisterReceiver(this);
+                                         DeviceHelper.setAppVersion(vnew);
+                                     }
+                                 }
+            , new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+    }*/
+}

android/Pictogram/yotta_tablet/src/main/res/values-en/strings.xml → android/Pictogram/communicator/src/main/res/values-en/strings.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Pictogram Tablet</string>
+    <string name="app_name">Pictogram Communicator</string>
     <string name="ilegal_user">There is not any supervisor named</string>
     <string name="new_version_detail">Pulse OK para proceder con la instalación</string>
     <!-- <string name="new_version_downloading">Please wait, downloading new version </string> -->

android/Pictogram/yotta_tablet/src/main/res/values-es/strings.xml → android/Pictogram/communicator/src/main/res/values-es/strings.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Pictogram Tablet</string>
+    <string name="app_name">Pictogram Communicator</string>
     <string name="ilegal_user"> No existe ningún supervisor </string>
     <string name="new_version_detail">Pulse OK para proceder con la instalación</string>
 <!--    <string name="new_version_downloading">Por favor espere, descargando nueva versión </string> -->

android/Pictogram/yotta_tablet/src/main/res/values/strings.xml → android/Pictogram/communicator/src/main/res/values/strings.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Pictogram Tablet</string>
+    <string name="app_name">Pictogram Communicator</string>
     <string name="ilegal_user">There is not any supervisor named</string>
     <string name="new_version_detail">Por favor, visite Google Play para instalar la nueva versión</string>
     <!-- <string name="new_version_downloading">Por favor espere, descargando nueva versión </string> -->

android/Pictogram/settings.gradle

-include ':supervisor', ':yotta_tablet', ':commonlibrary', ':watch', ':tabletlibrary'
+include ':supervisor', ':communicator', ':commonlibrary', ':watch', ':tabletlibrary'

android/Pictogram/supervisor/build.gradle

 apply plugin: 'com.android.application'
 
 android {
-  /*signingConfigs {
-    config {
-      keyAlias 'Pictogram'
-      keyPassword 'danoia'
-      storeFile file('C:/Users/Fernando/pictogramkeys.jks')
-      storePassword 'danoia'
-    }
-  }*/
+
 
   compileSdkVersion 24
   buildToolsVersion '25.0.0'
   defaultConfig {
-    applicationId "com.yottacode.supervisor_tablet"
+    applicationId "com.yottacode.supervisor"
     minSdkVersion 21
     targetSdkVersion 22
     versionCode 3

android/Pictogram/supervisor/src/main/res/values-en/strings.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Pictogram Tablet Supervisor</string>
+    <string name="app_name">Pictogram Supervisor</string>
     <string name="new_version_detail">Please, go to Google Play to download the new version  </string>
     https://play.google.com/store/apps/details?id=com.yottacode.supervisor_tablet
 </resources>

android/Pictogram/supervisor/src/main/res/values-es/strings.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Pictogram Tablet Supervisor</string>
+    <string name="app_name">Pictogram Supervisor</string>
     <string name="new_version_detail">Por favor, descargue la nueva versión en Google Play   </string>
 
 </resources>

android/Pictogram/supervisor/src/main/res/values/strings.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Pictogram Tablet Supervisor</string>
+    <string name="app_name">Pictogram Supervisor</string>
     <string name="new_version_detail">Please, go to Google Play to download the new version  </string>
 
 </resources>

android/Pictogram/supervisor/supervisor.iml

@@ -112,15 +112,24 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
@@ -131,25 +140,24 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="support-v4-24.2.1" level="project" />
     <orderEntry type="library" exported="" name="support-compat-24.2.1" level="project" />
+    <orderEntry type="library" exported="" name="support-media-compat-24.2.1" level="project" />
     <orderEntry type="library" exported="" name="animated-vector-drawable-24.2.1" level="project" />
     <orderEntry type="library" exported="" name="support-fragment-24.2.1" level="project" />
-    <orderEntry type="library" exported="" name="play-services-base-9.2.1" level="project" />
-    <orderEntry type="library" exported="" name="play-services-clearcut-9.2.1" level="project" />
-    <orderEntry type="library" exported="" name="android-gif-drawable-1.1.7" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" />
-    <orderEntry type="library" exported="" name="support-media-compat-24.2.1" level="project" />
     <orderEntry type="library" exported="" name="play-services-gcm-9.2.1" level="project" />
     <orderEntry type="library" exported="" name="play-services-auth-base-9.2.1" level="project" />
     <orderEntry type="library" exported="" name="support-core-ui-24.2.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-base-9.2.1" level="project" />
     <orderEntry type="library" exported="" name="play-services-gass-9.2.1" level="project" />
     <orderEntry type="library" exported="" name="play-services-iid-9.2.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-24.2.1" level="project" />
     <orderEntry type="library" exported="" name="support-vector-drawable-24.2.1" level="project" />
     <orderEntry type="library" exported="" name="support-core-utils-24.2.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-clearcut-9.2.1" level="project" />
     <orderEntry type="library" exported="" name="play-services-basement-9.2.1" level="project" />
     <orderEntry type="library" exported="" name="play-services-tasks-9.2.1" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-24.2.1" level="project" />
     <orderEntry type="library" exported="" name="androidasync-2.2.1" level="project" />
+    <orderEntry type="library" exported="" name="android-gif-drawable-1.1.7" level="project" />
     <orderEntry type="library" exported="" name="play-services-auth-9.2.1" level="project" />
     <orderEntry type="library" exported="" name="ion-2.2.1" level="project" />
     <orderEntry type="library" exported="" name="play-services-ads-9.2.1" level="project" />
@@ -160,11 +168,9 @@
     <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" />

android/Pictogram/tabletlibrary/src/main/res/values-es/strings.xml

@@ -15,7 +15,7 @@
     <string name="session_empty">Este alumno no tiene ningún método asignado. Por favor asigne un método a este alumno en</string>
     <string name="session_notclosed">Este alumno tiene una sesión abierta. Por favor cierre la sesión desde Pictogram Web en</string>
     <string name="session_closed_ok">Sesión grabada correctamente. Hora</string>
-    <string name="session_closed_fail">Sesión no cerrada. Por favor cierre la sesión en el panel de control de Pictogram Tablet</string>
+    <string name="session_closed_fail">Sesión no cerrada. Por favor cierre la sesión en el panel de control de Pictogram Web</string>
     <string name="session_pause_error">Error pausando la sesión</string>
     <string name="session_noinet">Conexión a Internet necesaria para grabar sesiones. Por favor, asegúrese que tiene conexión</string>
     <string name="session_inetok">Conexión con el servidor restablecida</string>

android/Pictogram/yotta_tablet/.gitignore

-/build
-.iml

android/Pictogram/yotta_tablet/build.gradle

-apply plugin: 'com.android.application'
-
-android {
-    /*signingConfigs {
-      config {
-        keyAlias 'Pictogram'
-        keyPassword 'danoia'
-        storeFile file('C:/Users/Fernando/pictogramkeys.jks')
-        storePassword 'danoia'
-      }
-    }*/
-
-    compileSdkVersion 24
-    buildToolsVersion '25.0.0'
-    defaultConfig {
-        applicationId "com.yottacode.pictogram.yotta_tablet"
-        minSdkVersion 21
-        targetSdkVersion 22
-        versionCode 3
-        versionName "1.5"
-        resValue "bool","NotifyAllwaysVisible","true"
-        resValue "string","apk","pictogram.apk"
-        resValue "string", "VersionManagerClass", "com.yottacode.pictogram.yotta_tablet.net.com.yottacode.pictogram.yotta_tablet.net.VersionManager"
-//    signingConfig signingConfigs.config
-    }
-    productFlavors {
-        CIFlavor {
-            resValue "string", "server", "http://ci.yottacode.com"
-            resValue "bool", "ssl_connect", "false"
-        }
-        DevFlavor {
-            resValue "string", "server", "https://dev.pictogramweb.com"
-            resValue "bool", "ssl_connect", "false"
-            resValue "string","apk","pictogram_dev.apk"
-        }
-        PreFlavor {
-            resValue "string", "server", "https://apk.pictogramweb.com"
-            resValue "bool", "ssl_connect", "true"
-            resValue "string","apk","pictogram.apk"
-        }
-        LocalFlavor {
-            resValue "string", "server", "http://192.168.1.35:1337"
-            resValue "bool", "ssl_connect", "false"
-        }
-    }
-}
-
-dependencies {
-    compile 'com.android.support:appcompat-v7:24.+'
-    compile 'com.android.support:support-v4:24.1.1'
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile project(':tabletlibrary')
-}

android/Pictogram/yotta_tablet/proguard-rules.pro

-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in e:\Users\Fernando\AppData\Local\Android\sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}

android/Pictogram/yotta_tablet/src/main/java/com/yottacode/pictogram/yotta_tablet/kiosk/AppContext.java

-package com.yottacode.pictogram.yotta_tablet.kiosk;
-
-import android.app.Application;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.PowerManager;
-
-/**
- * Created by emblanco on 14/10/15.
- */
-public class AppContext extends Application {
-
-    private AppContext instance;
-    private PowerManager.WakeLock wakeLock;
-    private OnScreenOffReceiver onScreenOffReceiver;
-
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        instance = this;
-        registerKioskModeScreenOffReceiver();
-        startKioskService();  // Service for restarting the app when another app go to foreground
-
-    }
-
-    private void registerKioskModeScreenOffReceiver() {
-        // register screen off receiver
-        final IntentFilter filter = new IntentFilter(Intent.ACTION_SCREEN_OFF);
-        onScreenOffReceiver = new OnScreenOffReceiver();
-        registerReceiver(onScreenOffReceiver, filter);
-    }
-
-    public PowerManager.WakeLock getWakeLock() {
-        if(wakeLock == null) {
-            // lazy loading: first call, create wakeLock via PowerManager.
-            PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-            wakeLock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP, "wakeup");
-        }
-        return wakeLock;
-    }
-
-    // Service for restarting the app when another app go to foreground
-    private void startKioskService() {
-        startService(new Intent(this, KioskService.class));
-    }
-}

android/Pictogram/yotta_tablet/src/main/java/com/yottacode/pictogram/yotta_tablet/kiosk/KioskService.java

-package com.yottacode.pictogram.yotta_tablet.kiosk;
-
-import android.app.ActivityManager;
-import android.app.NotificationManager;
-import android.app.Service;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.IBinder;
-import android.preference.PreferenceManager;
-import android.util.Log;
-
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Created by emblanco on 15/10/15.
- *
- * Since Android 4 there is no effective method to deactivate the home button.
- * That is the reason why we need to do a little hack.
- * In general the idea is to detect when a new application is in foreground and restart
- * your activity immediately.
- *
- * The thread checks every two seconds if the app is running in foreground.
- * If not, the thread will immediately recreate your activity.
- *
- */
-public class KioskService extends Service {
-
-    private static final long INTERVAL = TimeUnit.SECONDS.toMillis(2); // periodic interval to check in seconds -> 2 seconds
-    private static final String TAG = KioskService.class.getSimpleName();
-    private static final String PREF_KIOSK_MODE = "pref_kiosk_mode";
-
-    private Thread t = null;
-    private Context ctx = null;
-    private boolean running = false;
-
-    @Override
-    public void onDestroy() {
-        Log.i(TAG, "Stopping service 'KioskService'");
-        running =false;
-        NotificationManager mNotificationManager =
-            (NotificationManager)this.getBaseContext().getSystemService(this.getBaseContext().NOTIFICATION_SERVICE);
-        mNotificationManager.cancel(666);
-        super.onDestroy();
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        Log.i(TAG, "Starting service 'KioskService'");
-        running = true;
-        ctx = this;
-
-        // start a thread that periodically checks if your app is in the foreground
-        t = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                do {
-                    handleKioskMode();
-                    try {
-                        Thread.sleep(INTERVAL);
-                    } catch (InterruptedException e) {
-                        Log.i(TAG, "Thread interrupted: 'KioskService'");
-                    }
-                }while(running);
-                stopSelf();
-            }
-        });
-
-        t.start();
-        return Service.START_NOT_STICKY;
-    }
-
-    private void handleKioskMode() {
-        // is Kiosk Mode active?
-        if(isKioskModeActive(this)) {
-            // is App in background?
-            if(isInBackground()) {
-                restoreApp(); // restore!
-            }
-        }
-    }
-
-    private boolean isInBackground() {
-        ActivityManager am = (ActivityManager) ctx.getSystemService(Context.ACTIVITY_SERVICE);
-
-        List<ActivityManager.RunningTaskInfo> taskInfo = am.getRunningTasks(1);
-        ComponentName componentInfo = taskInfo.get(0).topActivity;
-        return (!ctx.getApplicationContext().getPackageName().equals(componentInfo.getPackageName()));
-    }
-
-    private void restoreApp() {
-        // Restart activity
-        Intent i = new Intent(ctx, com.yottacode.pictogram.tabletlibrary.gui.login.SerialActivity.class);
-        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        ctx.startActivity(i);
-    }
-
-    public boolean isKioskModeActive(final Context context) {
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-        return sp.getBoolean(PREF_KIOSK_MODE, false);
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-}

android/Pictogram/yotta_tablet/src/main/java/com/yottacode/pictogram/yotta_tablet/kiosk/OnScreenOffReceiver.java

-package com.yottacode.pictogram.yotta_tablet.kiosk;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.PowerManager;
-import android.preference.PreferenceManager;
-
-/**
- * Created by emblanco on 14/10/15.
- *
- *
- Short power button press:
-
- It can detect a short button press by handling the ACTION_SCREEN_OFF intent and kick the screen
- back to life with acquiring a wake lock.
- *
- *
- *
- */
-public class OnScreenOffReceiver extends BroadcastReceiver {
-    private static final String PREF_KIOSK_MODE = "pref_kiosk_mode";
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if(Intent.ACTION_SCREEN_OFF.equals(intent.getAction())){
-            AppContext ctx = (AppContext) context.getApplicationContext();
-            // is Kiosk Mode active?
-            if(isKioskModeActive(ctx)) {
-                wakeUpDevice(ctx);
-            }
-        }
-    }
-
-    private void wakeUpDevice(AppContext context) {
-        PowerManager.WakeLock wakeLock = context.getWakeLock(); // get WakeLock reference via AppContext
-        if (wakeLock.isHeld()) {
-            wakeLock.release(); // release old wake lock
-        }
-
-        // create a new wake lock...
-        wakeLock.acquire();
-
-        // ... and release again
-        wakeLock.release();
-    }
-
-    private boolean isKioskModeActive(final Context context) {
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-        return sp.getBoolean(PREF_KIOSK_MODE, false);
-    }
-}

android/Pictogram/yotta_tablet/src/main/java/com/yottacode/pictogram/yotta_tablet/net/VersionManager.java

-package com.yottacode.pictogram.yotta_tablet.net;
-
-import android.app.AlertDialog;
-import android.app.DownloadManager;
-import android.app.ProgressDialog;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.Uri;
-import android.os.Environment;
-import android.text.SpannableString;
-import android.text.method.LinkMovementMethod;
-import android.text.util.Linkify;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.widget.TextView;
-
-import com.yottacode.pictogram.dao.DeviceHelper;
-import com.yottacode.pictogram.net.iVersionManager;
-import com.yottacode.pictogram.tools.PCBcontext;
-import com.yottacode.pictogram.yotta_tablet.R;
-import com.yottacode.tools.GUITools;
-
-import java.io.File;
-
-import static android.app.Activity.RESULT_OK;
-
-/**
- * Created by Fernando on 10/03/2017.
- */
-
-public class VersionManager implements iVersionManager {
-    static final String LOG_TAG=VersionManager.class.getCanonicalName();
-
-    public void newVersionAlert(final float version, final Context context, final float vnew) {
-
-        final SpannableString s = new SpannableString(context.getResources().getString(R.string.google_play_student_apk));
-
-        final TextView tx1 = new TextView(context);
-        tx1.setText("\t"+context.getResources().getString(R.string.new_version_detail) +
-            "\n\t\t"+ s);
-        tx1.setTextSize(16);
-        tx1.setAutoLinkMask(RESULT_OK);
-        tx1.setMovementMethod(LinkMovementMethod.getInstance());
-
-        Linkify.addLinks(s, Linkify.WEB_URLS);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(context);
-        builder.setTitle(context.getResources().getString(R.string.app_name)+": "+context.getResources().getString(R.string.new_version_title)+" v"+vnew)
-            .setCancelable(false)
-            .setPositiveButton("OK",
-                new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog,
-                                        int id) {
-                        DeviceHelper.setAppVersion(vnew);
-                    }
-                })
-
-            .setView(tx1).setOnKeyListener(new DialogInterface.OnKeyListener() {
-            @Override
-            public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
-
-                return false;
-            }
-        }).show();
-        PCBcontext.setActivityContext(null);
-
-    }
-
-    /*
-    public void newVersionAlert(final float version, final Context context, final float vnew) {
-        GUITools.show_alert(
-            PCBcontext.getActivityContext(), R.string.new_version_title,
-            PCBcontext.getContext().getResources().getString(R.string.new_version_detail)+" v" + version, new GUITools.iOKListener() {
-                @Override
-                public void ok() {
-                    downloadNewVersion(version,PCBcontext.getActivityContext(), version);
-                }
-            });
-    }
-    private void downloadNewVersion(final float version, final Context context, final float vnew) {
-        final ProgressDialog progressDialog=ProgressDialog.show(context, context.getString(R.string.userLoadingTxt),context.getString(R.string.new_version_downloading));
-        progressDialog.show();
-        String destination = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + "/";
-        String fileName = context.getResources().getString(com.yottacode.pictogram.R.string.apk);
-        String apkurl=context.getResources().getString(com.yottacode.pictogram.R.string.server);
-        apkurl="https://pre.yottacode.com"
-            + "/" + fileName;
-        destination += fileName;
-        final Uri uri = Uri.parse("file://" + destination);
-        Log.i(LOG_TAG,"Downloading new version from "+apkurl+" to "+destination);
-        //Delete update file if exists
-        File file = new File(destination);
-        if (file.exists())
-            file.delete();
-
-        //set downloadmanager
-        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(apkurl));
-        request.setDescription(context.getString(R.string.new_version_detail));
-        request.setTitle(context.getString(com.yottacode.pictogram.R.string.app_name));
-
-        //set destination
-        request.setDestinationUri(uri);
-
-        // get download service and enqueue file
-        final DownloadManager manager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-        final long downloadId = manager.enqueue(request);
-
-
-        //register receiver for when .apk download is complete
-        context.registerReceiver(new BroadcastReceiver() {
-                                     public void onReceive(Context ctxt, Intent intent) {
-                                         progressDialog.dismiss();
-                                         Intent install = new Intent(Intent.ACTION_VIEW);
-                                         install.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                                         install.setDataAndType(uri,
-                                             manager.getMimeTypeForDownloadedFile(downloadId));
-                                         context.startActivity(install);
-                                         context.unregisterReceiver(this);
-                                         DeviceHelper.setAppVersion(vnew);
-                                     }
-                                 }
-            , new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
-    }*/
-}

android/Pictogram/yotta_tablet/src/main/java/com/yottacode/pictogram/yotta_tablet/net/com/yottacode/pictogram/yotta_tablet/net/VersionManager.java

-package com.yottacode.pictogram.yotta_tablet.net.com.yottacode.pictogram.yotta_tablet.net;
-
-import android.app.AlertDialog;
-import android.app.DownloadManager;
-import android.app.ProgressDialog;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.Uri;
-import android.os.Environment;
-import android.text.SpannableString;
-import android.text.method.LinkMovementMethod;
-import android.text.util.Linkify;
-import android.view.KeyEvent;
-import android.widget.TextView;
-
-import com.yottacode.pictogram.dao.DeviceHelper;
-import com.yottacode.pictogram.net.iVersionManager;
-import com.yottacode.pictogram.tools.PCBcontext;
-import com.yottacode.pictogram.yotta_tablet.R;
-import com.yottacode.tools.GUITools;
-
-import java.io.File;
-
-import static android.app.Activity.RESULT_OK;
-
-/**
- * Created by Fernando on 10/03/2017.
- */
-
-public class VersionManager implements iVersionManager {
-    static final String LOG_TAG=VersionManager.class.getCanonicalName();
-/*
-    public void newVersionAlert(final float version, final Context context, final float vnew) {
-        GUITools.show_alert(
-            PCBcontext.getActivityContext(), R.string.new_version_title,
-            PCBcontext.getContext().getResources().getString(R.string.new_version_detail)+" v" + version, new GUITools.iOKListener() {
-                @Override
-                public void ok() {
-                    downloadNewVersion(version,PCBcontext.getActivityContext(), version);
-                }
-            });
-    }
-    private void downloadNewVersion(final float version, final Context context, final float vnew) {
-        final ProgressDialog progressDialog=ProgressDialog.show(context, context.getString(R.string.userLoadingTxt),context.getString(R.string.new_version_downloading));
-        progressDialog.show();
-        String destination = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + "/";
-        String fileName = context.getResources().getString(com.yottacode.pictogram.R.string.apk);
-        String apkurl=context.getResources().getString(com.yottacode.pictogram.R.string.server)
-            + "/" + fileName;
-        destination += fileName;
-        final Uri uri = Uri.parse("file://" + destination);
-
-        //Delete update file if exists
-        File file = new File(destination);
-        if (file.exists())
-            file.delete();
-
-        //set downloadmanager
-        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(apkurl));
-        request.setDescription(context.getString(R.string.new_version_detail));
-        request.setTitle(context.getString(com.yottacode.pictogram.R.string.app_name));
-
-        //set destination
-        request.setDestinationUri(uri);
-
-        // get download service and enqueue file
-        final DownloadManager manager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-        final long downloadId = manager.enqueue(request);
-
-
-        //register receiver for when .apk download is compete
-        context.registerReceiver(new BroadcastReceiver() {
-                                     public void onReceive(Context ctxt, Intent intent) {
-                                         progressDialog.dismiss();
-                                         Intent install = new Intent(Intent.ACTION_VIEW);
-                                         install.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                                         install.setDataAndType(uri,
-                                             manager.getMimeTypeForDownloadedFile(downloadId));
-                                         context.startActivity(install);
-                                         context.unregisterReceiver(this);
-                                         DeviceHelper.setAppVersion(version);
-                                     }
-                                 }
-            , new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
-    }*/
-
-    public void newVersionAlert(final float version, final Context context, final float vnew) {
-
-        final SpannableString s = new SpannableString(context.getResources().getString(R.string.google_play_student_apk));
-
-        final TextView tx1 = new TextView(context);
-        tx1.setText("\t"+context.getResources().getString(R.string.new_version_detail) +
-            "\n\t\t"+ s);
-        tx1.setTextSize(16);
-        tx1.setAutoLinkMask(RESULT_OK);
-        tx1.setMovementMethod(LinkMovementMethod.getInstance());
-
-        Linkify.addLinks(s, Linkify.WEB_URLS);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(context);
-        builder.setTitle(context.getResources().getString(R.string.app_name)+": "+context.getResources().getString(R.string.new_version_title)+" v"+vnew)
-            .setCancelable(false)
-            .setPositiveButton("OK",
-                new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog,
-                                        int id) {
-                        DeviceHelper.setAppVersion(vnew);
-                    }
-                })
-
-            .setView(tx1).setOnKeyListener(new DialogInterface.OnKeyListener() {
-            @Override
-            public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
-
-                return false;
-            }
-        }).show();
-        PCBcontext.setActivityContext(null);
-
-    }
-}
-