2.0.2

fixes to timer afk

Author: Osiris-Team

build.gradle

@@ -29,7 +29,7 @@ configure(subprojects - project(':android')) {
 }
 
 subprojects {
-  version = '2.0.1'
+  version = '2.0.2'
   ext.appName = 'Desku-App'
   repositories {
     mavenCentral()

core/src/main/java/com/osiris/jsqlgen/ui/timer/LayoutTimer.java

@@ -17,6 +17,7 @@
 
 import java.sql.Timestamp;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -55,16 +56,23 @@ public LayoutTimer() {
                 isPendingAFKPopup = false;
                 if(ui instanceof DesktopUI){
                     try{
-                        ui.fullscreen(true);
+                        ui.maximize(true);
                         ui.focus(true);
                     } catch (Exception e) {
                         throw new RuntimeException(e);
                     }
                 }
                 Timer timer = Timer.whereId().biggestFirst().limit(1).getFirstOrNull();
-                if(timer != null && timer.end != Timer.NULL){
-                    add(new SlidersPopup(true, timer));
+                Objects.requireNonNull(timer);
+                if(timer.end != Timer.NULL){
+                    timer.end = new Timestamp(msLastActivity);
+                    timer.update();
                 }
+                // Open the popup to determine the previous actual work timer work amount
+                add(new SlidersPopup(true, timer));
+                // Create a timer for the AFK portion
+                timer = Timer.createAndAdd(new Timestamp(msLastActivity), new Timestamp(System.currentTimeMillis()));
+                add(new SlidersPopup(true, timer));
             });
         };
         refresh();