Added stop button

app/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainJavaActivity">
+        <activity android:name=".MainKotlinActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/com/oatrice/internet_speed_testing/Adapter.java

@@ -28,6 +28,10 @@ public void setDataList(int position, ProgressionModel data) {
 
     }
 
+    public void clearData() {
+        dataList.clear();
+    }
+
     @Override
     public MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_item, parent, false);

app/src/main/java/com/oatrice/internet_speed_testing/MainKotlinActivity.kt

@@ -0,0 +1,78 @@
+package com.oatrice.internet_speed_testing
+
+import android.os.Bundle
+import android.os.Handler
+import android.support.v7.app.AppCompatActivity
+import android.support.v7.widget.LinearLayoutManager
+import android.support.v7.widget.RecyclerView
+import android.widget.Button
+import com.example.internet_speed_testing.InternetSpeedBuilder
+import com.example.internet_speed_testing.ProgressionModel
+
+class MainKotlinActivity : AppCompatActivity() {
+    private var recyclerView: RecyclerView? = null
+    private var adapter: Adapter? = null
+
+    private lateinit var startButton: Button
+    private lateinit var stopButton: Button
+    private var started: Boolean = false
+
+    private val builder = InternetSpeedBuilder(this)
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        recyclerView = findViewById(R.id.recyclerview)
+        startButton = findViewById(R.id.start_button)
+        stopButton = findViewById(R.id.stop_button)
+
+        adapter = Adapter()
+        recyclerView!!.layoutManager = LinearLayoutManager(this)
+        recyclerView!!.adapter = adapter
+
+        startButton.setOnClickListener { view ->
+            if(started) {
+                started = false
+                adapter!!.clearData()
+            }
+            startSpeedTest()
+
+            // TODO[Restart properly]: Find a proper way to stop both socket instead of using this hack
+            Handler().postDelayed({
+                enableStopButton()
+            },10000)
+        }
+
+        stopButton.setOnClickListener { view ->
+            stopSpeedTest()
+        }
+    }
+
+    private fun startSpeedTest() {
+        builder.setOnEventInternetSpeedListener(object : InternetSpeedBuilder.OnEventInternetSpeedListener {
+            override fun onDownloadProgress(count: Int, progressModel: ProgressionModel) {
+
+            }
+
+            override fun onUploadProgress(count: Int, progressModel: ProgressionModel) {
+
+            }
+
+            override fun onTotalProgress(count: Int, progressModel: ProgressionModel) {
+                adapter!!.setDataList(count, progressModel)
+
+            }
+        })
+        builder.start("http://2.testdebit.info/fichiers/1Mo.dat", 20)
+    }
+
+    private fun stopSpeedTest() {
+        builder.stop()
+    }
+
+    private fun enableStopButton() {
+        stopButton.isEnabled = true
+    }
+}

app/src/main/res/layout/activity_main.xml

@@ -46,4 +46,25 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"/>
 
+    <Button
+        android:id="@+id/start_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Start"
+        app:layout_constraintTop_toBottomOf="@layout/view_item"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="@+id/stop_button"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+    <Button
+        android:id="@+id/stop_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Stop"
+        android:enabled="false"
+        app:layout_constraintTop_toBottomOf="@layout/view_item"
+        app:layout_constraintLeft_toLeftOf="@id/start_button"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
 </android.support.constraint.ConstraintLayout>

internet-speed-testing/src/main/java/com/example/internet_speed_testing/InternetSpeedBuilder.kt

@@ -7,6 +7,7 @@ import fr.bmartel.speedtest.SpeedTestReport
 import fr.bmartel.speedtest.SpeedTestSocket
 import fr.bmartel.speedtest.inter.ISpeedTestListener
 import fr.bmartel.speedtest.model.SpeedTestError
+import java.math.BigDecimal
 
 class InternetSpeedBuilder(var activity: Activity) {
 
@@ -17,6 +18,8 @@ class InternetSpeedBuilder(var activity: Activity) {
     lateinit var onDownloadProgressListener: ()->Unit
     lateinit var onUploadProgressListener: ()->Unit
     lateinit var onTotalProgressListener: ()->Unit
+    lateinit var downloadTestSocket: SpeedTestSocket
+    lateinit var uploadTestSocket: SpeedTestSocket
     private lateinit var progressModel: ProgressionModel
 
     fun start(url: String, limitCount: Int) {
@@ -25,6 +28,13 @@ class InternetSpeedBuilder(var activity: Activity) {
         startTestDownload()
     }
 
+    // TODO[Restart properly]: Find a proper way to stop both socket
+    fun stop() {
+        this.LIMIT = 0
+        downloadTestSocket.forceStopTask()
+        uploadTestSocket.forceStopTask()
+    }
+
     fun setOnEventInternetSpeedListener(javaListener: OnEventInternetSpeedListener) {
         this.javaListener = javaListener
     }
@@ -60,10 +70,10 @@ class InternetSpeedBuilder(var activity: Activity) {
 
         override fun doInBackground(vararg params: Void): String? {
 
-            val speedTestSocket = SpeedTestSocket()
+            downloadTestSocket = SpeedTestSocket()
 
             // add a listener to wait for speedtest completion and progress
-            speedTestSocket.addSpeedTestListener(object : ISpeedTestListener {
+            downloadTestSocket.addSpeedTestListener(object : ISpeedTestListener {
 
                 override fun onCompletion(report: SpeedTestReport) {
                     // called when download/upload is finished
@@ -110,7 +120,7 @@ class InternetSpeedBuilder(var activity: Activity) {
                 }
             })
 
-            speedTestSocket.startDownload(url)
+            downloadTestSocket.startDownload(url)
 
             return null
         }
@@ -120,10 +130,10 @@ class InternetSpeedBuilder(var activity: Activity) {
 
         override fun doInBackground(vararg params: Void): Void? {
 
-            val speedTestSocket = SpeedTestSocket()
+            uploadTestSocket = SpeedTestSocket()
 
             // add a listener to wait for speedtest completion and progress
-            speedTestSocket.addSpeedTestListener(object : ISpeedTestListener {
+            uploadTestSocket.addSpeedTestListener(object : ISpeedTestListener {
 
                 override fun onCompletion(report: SpeedTestReport) {
                     // called when download/upload is finished
@@ -172,7 +182,7 @@ class InternetSpeedBuilder(var activity: Activity) {
                 }
             })
 
-            speedTestSocket.startDownload(url)
+            uploadTestSocket.startDownload(url)
 
             return null
         }