Improved auto test duration formula; Updated to latest gradle etc

librespeed · Sep 27, 2020 · 65e0c4c · 65e0c4c
1 parent e4ab5fc
commit 65e0c4c
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 9 deletions.
diff --git a/Speedtest-Android/.idea/codeStyles/Project.xml b/Speedtest-Android/.idea/codeStyles/Project.xml
diff --git a/Speedtest-Android/.idea/jarRepositories.xml b/Speedtest-Android/.idea/jarRepositories.xml
diff --git 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
@@ -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
@@ -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
@@ -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