リファクタ

tateisu · Sep 11, 2018 · 1e90ef3 · 1e90ef3
1 parent 50f164c
commit 1e90ef3
Show file tree

Hide file tree

Showing 3 changed files with 529 additions and 468 deletions.
diff --git a/app/src/main/java/jp/juggler/fadownloader/targets/FlashAir.kt b/app/src/main/java/jp/juggler/fadownloader/targets/FlashAir.kt
@@ -273,7 +273,7 @@ class FlashAir(private val service : DownloadService, internal val thread : Down
 
 			if(thread.target_type == Pref.TARGET_TYPE_FLASHAIR_STA) {
 				while(! thread.isCancelled) {
-					val tracker_last_result = service.wifi_tracker.bLastConnected.get()
+					val tracker_last_result = service.wifi_tracker.bLastConnected
 					val air_url = service.wifi_tracker.lastTargetUrl.get()
 					if(tracker_last_result && air_url.isNotEmpty() ) {
 						thread.target_url = air_url

diff --git a/app/src/main/java/jp/juggler/fadownloader/targets/PqiAirCard.kt b/app/src/main/java/jp/juggler/fadownloader/targets/PqiAirCard.kt
@@ -298,7 +298,7 @@ class PqiAirCard(
 
 			if(thread.target_type == Pref.TARGET_TYPE_PQI_AIR_CARD_TETHER) {
 				while(! thread.isCancelled) {
-					val tracker_last_result = service.wifi_tracker.bLastConnected.get()
+					val tracker_last_result = service.wifi_tracker.bLastConnected
 					val air_url = service.wifi_tracker.lastTargetUrl.get()
 					if(tracker_last_result && air_url.isNotEmpty()) {
 						thread.target_url = air_url