From 65e0c4c6185429c9995343fa846ab5c46581c455 Mon Sep 17 00:00:00 2001
From: dosse91 <info@fdossena.com>
Date: Sun, 27 Sep 2020 20:26:05 +0200
Subject: [PATCH] Improved auto test duration formula; Updated to latest gradle
 etc

---
 .../.idea/codeStyles/Project.xml              | 18 +++++++++++++
 Speedtest-Android/.idea/jarRepositories.xml   | 25 +++++++++++++++++++
 Speedtest-Android/app/build.gradle            |  4 +--
 .../core/worker/SpeedtestWorker.java          |  8 +++---
 Speedtest-Android/build.gradle                |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  4 +--
 6 files changed, 52 insertions(+), 9 deletions(-)
 create mode 100644 Speedtest-Android/.idea/jarRepositories.xml

diff --git a/Speedtest-Android/.idea/codeStyles/Project.xml b/Speedtest-Android/.idea/codeStyles/Project.xml
index 681f41a..0d15693 100644
--- a/Speedtest-Android/.idea/codeStyles/Project.xml
+++ b/Speedtest-Android/.idea/codeStyles/Project.xml
@@ -1,5 +1,23 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
diff --git a/Speedtest-Android/.idea/jarRepositories.xml b/Speedtest-Android/.idea/jarRepositories.xml
new file mode 100644
index 0000000..a5f05cd
--- /dev/null
+++ b/Speedtest-Android/.idea/jarRepositories.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/Speedtest-Android/app/build.gradle b/Speedtest-Android/app/build.gradle
index d41a196..8ed4777 100644
--- a/Speedtest-Android/app/build.gradle
+++ b/Speedtest-Android/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "your.name.here.speedtest"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 6
-        versionName '1.2'
+        versionCode 8
+        versionName '1.2.2'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/Speedtest-Android/app/src/main/java/com/fdossena/speedtest/core/worker/SpeedtestWorker.java b/Speedtest-Android/app/src/main/java/com/fdossena/speedtest/core/worker/SpeedtestWorker.java
index d5d3af9..727b379 100644
--- a/Speedtest-Android/app/src/main/java/com/fdossena/speedtest/core/worker/SpeedtestWorker.java
+++ b/Speedtest-Android/app/src/main/java/com/fdossena/speedtest/core/worker/SpeedtestWorker.java
@@ -124,8 +124,8 @@ public void onError(String err) {
                 for (DownloadStream d : streams) totDownloaded += d.getTotalDownloaded();
                 double speed = totDownloaded / ((t<100?100:t) / 1000.0);
                 if (config.getTime_auto()) {
-                    double b = (3.2 * speed) / 100000.0;
-                    bonusT += b > 400 ? 400 : b;
+                    double b = (2.5 * speed) / 100000.0;
+                    bonusT += b > 200 ? 200 : b;
                 }
                 double progress = (t + bonusT) / (double) (config.getTime_dl_max() * 1000);
                 speed = (speed * 8 * config.getOverheadCompensationFactor()) / (config.getUseMebibits() ? 1048576.0 : 1000000.0);
@@ -176,8 +176,8 @@ public void onError(String err) {
                 for (UploadStream u : streams) totUploaded += u.getTotalUploaded();
                 double speed = totUploaded / ((t<100?100:t) / 1000.0);
                 if (config.getTime_auto()) {
-                    double b = (3.2 * speed) / 100000.0;
-                    bonusT += b > 400 ? 400 : b;
+                    double b = (2.5 * speed) / 100000.0;
+                    bonusT += b > 200 ? 200 : b;
                 }
                 double progress = (t + bonusT) / (double) (config.getTime_ul_max() * 1000);
                 speed = (speed * 8 * config.getOverheadCompensationFactor()) / (config.getUseMebibits() ? 1048576.0 : 1000000.0);
diff --git a/Speedtest-Android/build.gradle b/Speedtest-Android/build.gradle
index 2afeee3..95a3996 100644
--- a/Speedtest-Android/build.gradle
+++ b/Speedtest-Android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/Speedtest-Android/gradle/wrapper/gradle-wrapper.properties b/Speedtest-Android/gradle/wrapper/gradle-wrapper.properties
index 4648c97..4142380 100644
--- a/Speedtest-Android/gradle/wrapper/gradle-wrapper.properties
+++ b/Speedtest-Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Mar 09 08:55:09 CET 2020
+#Sun Sep 27 20:23:36 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip