Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions app/src/main/java/com/phantomvk/identifier/app/main/MainManager.kt
Original file line number Diff line number Diff line change
Expand Up @@ -36,37 +36,40 @@ object MainManager {
}

val latch = CountDownLatch(1)
val simpleName = (provider as Any).javaClass.simpleName
val nanoTime = System.nanoTime()
val resultCallback = object : Consumer {
private val simpleName = (provider as Any).javaClass.simpleName
private val startNanoTime = System.nanoTime()
override fun onSuccess(result: IdentifierResult) {
list.add(ResultDetail(simpleName, result, getNanoTimeStamp()))
list.add(ResultDetail(simpleName, result, getNanoTimeStamp(nanoTime)))
latch.countDown()
}

override fun onError(msg: String, throwable: Throwable?) {
list.add(ResultDetail(simpleName, null, getNanoTimeStamp(), msg))
list.add(ResultDetail(simpleName, null, getNanoTimeStamp(nanoTime), msg))
latch.countDown()
}

private fun getNanoTimeStamp(): String {
val consumed = (System.nanoTime() - startNanoTime) / 1000L
return decimalFormat.format(consumed)
}
}
setCallbackMethod.invoke(provider, resultCallback)
runMethod.invoke(provider)

try {
runMethod.invoke(provider)
} catch (t: Throwable) {
list.add(ResultDetail(simpleName, null, getNanoTimeStamp(nanoTime), t.toString()))
latch.countDown()
}

latch.await()
}

return list
}

private fun getProviderList(): List<*> {
// val application = Class.forName("android.app.ActivityThread")
// .getMethod("currentApplication")
// .invoke(null) as Application
private fun getNanoTimeStamp(time: Long): String {
val consumed = (System.nanoTime() - time) / 1000L
return decimalFormat.format(consumed)
}

private fun getProviderList(): List<*> {
val c = Class.forName("com.phantomvk.identifier.model.ProviderConfig")
val config = c.getConstructor(Context::class.java).newInstance(Application.applicationInstance)
c.getMethod("setAsyncCallback", Boolean::class.java).invoke(config, Settings.AsyncCallback.getValue())
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:textColor="#FF000000"
android:textSize="14sp"
android:textSize="12sp"
android:textStyle="bold" />
</RelativeLayout>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import com.phantomvk.identifier.provider.AsusProvider
import com.phantomvk.identifier.provider.CoolpadServiceProvider
import com.phantomvk.identifier.provider.CoolpadSettingsProvider
import com.phantomvk.identifier.provider.CooseaProvider
import com.phantomvk.identifier.provider.EXCEPTION_THROWN
import com.phantomvk.identifier.provider.FreemeProvider
import com.phantomvk.identifier.provider.GoogleAdsIdProvider
import com.phantomvk.identifier.provider.HonorSdkProvider
Expand Down Expand Up @@ -135,8 +134,8 @@ internal class SerialRunnable(
getConsumer().onSuccess(result)
}

override fun onError(msg: String, throwable: Throwable?) {
Log.e("SerialRunnable", "${provider.javaClass.simpleName} onError.", throwable)
override fun onError(msg: String, t: Throwable?) {
Log.e("SerialRunnable", "${provider.javaClass.simpleName} onError.", t)
execute(index + 1, providers)
}
})
Expand All @@ -145,7 +144,8 @@ internal class SerialRunnable(
try {
provider.run()
} catch (t: Throwable) {
getConsumer().onError(EXCEPTION_THROWN, t)
Log.e("SerialRunnable", "${provider.javaClass.simpleName} onRun.", t)
execute(index + 1, providers)
}
}

Expand Down