diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a695728..c2cea6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,9 @@ + diff --git a/app/src/main/ic_launcher_authentication_2-web.png b/app/src/main/ic_launcher_authentication_2-web.png deleted file mode 100644 index e559a16..0000000 Binary files a/app/src/main/ic_launcher_authentication_2-web.png and /dev/null differ diff --git a/app/src/main/ic_launcher_student_image_collection-web.png b/app/src/main/ic_launcher_student_image_collection-web.png deleted file mode 100644 index d858733..0000000 Binary files a/app/src/main/ic_launcher_student_image_collection-web.png and /dev/null differ diff --git a/app/src/main/java/org/literacyapp/authentication/helper/AuthenticationHelper.java b/app/src/main/java/org/literacyapp/authentication/helper/AuthenticationHelper.java index ebfff91..c9ad377 100644 --- a/app/src/main/java/org/literacyapp/authentication/helper/AuthenticationHelper.java +++ b/app/src/main/java/org/literacyapp/authentication/helper/AuthenticationHelper.java @@ -22,10 +22,13 @@ */ public class AuthenticationHelper { + private static final double[] countSteps = { 0, 5, 10, 15, 20, 25, 30, 35, 40, 45 }; private static final double[] exponentialDelayStepsInMinutes = { 30, 60, 120, 240, 480, 960, 1920, 3840, 7680, 15360 }; - public static synchronized void updateCurrentStudent(Student student, Context context, boolean isFallback){ + public static synchronized void updateCurrentStudent(Student student, Context context, boolean isFallback) { + Log.i(context.getClass().getName(), "updateCurrentStudent"); + LiteracyApplication literacyApplication = (LiteracyApplication) context; DaoSession daoSession = literacyApplication.getDaoSession(); AuthenticationEventDao authenticationEventDao = daoSession.getAuthenticationEventDao(); @@ -46,6 +49,8 @@ public static synchronized void updateCurrentStudent(Student student, Context co } private static void addExponentialDelayIfSameStudent(Context context, AuthenticationEventDao authenticationEventDao, Student newStudent){ + Log.i(context.getClass().getName(), "addExponentialDelayIfSameStudent"); + List authenticationEvents = authenticationEventDao.queryBuilder().orderDesc(AuthenticationEventDao.Properties.Time).list(); if (authenticationEvents.size() > 0){ int countOfRecurrentLogins = 0; diff --git a/app/src/main/java/org/literacyapp/content/task/LetterGraphemeActivity.java b/app/src/main/java/org/literacyapp/content/task/LetterGraphemeActivity.java index fae29ad..b58c14b 100644 --- a/app/src/main/java/org/literacyapp/content/task/LetterGraphemeActivity.java +++ b/app/src/main/java/org/literacyapp/content/task/LetterGraphemeActivity.java @@ -21,15 +21,11 @@ import org.literacyapp.dao.VideoDao; import org.literacyapp.model.content.Letter; import org.literacyapp.model.content.multimedia.Audio; -import org.literacyapp.model.content.multimedia.JoinVideosWithLetters; -import org.literacyapp.model.content.multimedia.Video; import org.literacyapp.util.MediaPlayerHelper; import org.literacyapp.util.MultimediaHelper; import org.literacyapp.util.TtsHelper; import java.io.File; -import java.util.ArrayList; -import java.util.List; public class LetterGraphemeActivity extends AppCompatActivity { @@ -93,28 +89,32 @@ public void onClick(View view) { public void onClick(View view) { Log.i(getClass().getName(), "onClick"); - // Look up video(s) containing letter - List