Skip to content

Commit f666f48

Browse files
committed
Disable Runnable
1 parent d423ee5 commit f666f48

2 files changed

Lines changed: 7 additions & 39 deletions

File tree

Sources/AndroidSwiftUI/MainActivity.swift

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ extension MainActivity {
3030
AndroidSwiftUIMain()
3131

3232
runAsync()
33-
34-
// drain main queue
35-
//drainMainQueue()
3633
}
3734
}
3835

@@ -53,26 +50,6 @@ private extension MainActivity {
5350
}
5451
}
5552
}
56-
57-
nonisolated func drainMainQueue() {
58-
log("\(self).\(#function)")
59-
// drain main queue
60-
Task { [weak self] in
61-
while let self = self {
62-
log("\(self).\(#function) Task Started")
63-
if #available(macOS 13.0, *) {
64-
try? await Task.sleep(for: .milliseconds(100))
65-
}
66-
let runnable = AndroidSwiftUI.Runnable {
67-
RunLoop.main.run(until: Date() + 0.01)
68-
}
69-
self.runOnUiThread(runnable.as(AndroidJavaLang.Runnable.self))
70-
if #available(macOS 13.0, *) {
71-
try? await Task.sleep(for: .seconds(1))
72-
}
73-
}
74-
}
75-
}
7653
}
7754

7855
extension MainActivity {

Sources/AndroidSwiftUI/Runnable.swift

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,18 @@ import JavaKit
99
import JavaRuntime
1010
import AndroidKit
1111
import AndroidJavaLang
12-
12+
/*
1313
@JavaClass("com.pureswift.swiftandroid.Runnable", extends: AndroidJavaLang.Runnable.self)
1414
open class Runnable: JavaObject {
1515

16-
private(set) var block: (() -> Void)?
16+
public typealias Block = () -> ()
1717

1818
@JavaMethod
19-
@_nonoverride public convenience init(environment: JNIEnvironment? = nil)
20-
21-
public convenience init(_ block: @escaping () -> Void) {
22-
self.init(environment: nil)
23-
self.block = block
24-
}
19+
@_nonoverride public convenience init(block: SwiftObject?, environment: JNIEnvironment? = nil)
2520

26-
deinit {
27-
log("\(self).\(#function)")
21+
public convenience init(_ block: @escaping () -> Void, environment: JNIEnvironment? = nil) {
22+
let object = SwiftObject(block, environment: environment)
23+
self.init(block: object, environment: environment)
2824
}
2925
}
3026

@@ -33,12 +29,7 @@ extension Runnable {
3329

3430
@JavaMethod
3531
func run() {
36-
guard let block else {
37-
logError("\(self).\(#function): No block set")
38-
return
39-
}
4032
block()
41-
log("\(self).\(#function) Executed")
4233
}
4334
}
4435

@@ -49,11 +40,11 @@ extension Runnable {
4940
static let log = try! JavaClass<AndroidUtil.Log>()
5041

5142
func log(_ string: String) {
52-
5343
_ = Self.log.d(Self.logTag, string)
5444
}
5545

5646
func logError(_ string: String) {
5747
_ = Self.log.e(Self.logTag, string)
5848
}
5949
}
50+
*/

0 commit comments

Comments
 (0)