dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-07-28 14:19:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

2 spaces holy war (#323)

Browse Source
This commit is contained in:
Evgeny Poberezkin
2022-02-17 09:15:54 +00:00
committed by GitHub
parent f74f932dcd
commit e7e777ec7b
2 changed files with 66 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/android/app/src/main/java/chat/simplex/app/MainPage.kt
+1 -2
View File
@@ -5,6 +5,5 @@ import chat.simplex.app.views.TerminalPage
@Composable
fun MainPage(vm: SimplexViewModel) {
TerminalPage(vm.chatModel)
}
}
apps/android/app/src/main/java/chat/simplex/app/SimplexApp.kt
+65 -65
View File
@@ -27,76 +27,76 @@ external fun chatSendCmd(ctrl: ChatCtrl, msg: String) : String
external fun chatRecvMsg(ctrl: ChatCtrl) : String
class SimplexApp: Application() {
private lateinit var controller: ChatController
private lateinit var controller: ChatController
override fun onCreate() {
super.onCreate()
controller = ChatController(chatInit(applicationContext.filesDir.toString()))
GlobalScope.launch {
withContext(Dispatchers.Main) {
var user = controller.apiGetActiveUser()
if (user == null) {
// user = controller.apiCreateActiveUser(Profile("android", "Android test"))
}
Log.d("SIMPLEX (user)", user.toString())
try {
controller.apiStartChat()
Log.d("SIMPLEX", "started chat")
} catch(e: Error) {
Log.d("SIMPLEX", "failed starting chat $e")
// throw e
}
}
override fun onCreate() {
super.onCreate()
controller = ChatController(chatInit(applicationContext.filesDir.toString()))
GlobalScope.launch {
withContext(Dispatchers.Main) {
var user = controller.apiGetActiveUser()
if (user == null) {
// user = controller.apiCreateActiveUser(Profile("android", "Android test"))
}
}
val chatModel by lazy {
val m = ChatModel(controller)
controller.setModel(m)
controller.startReceiver()
m
}
companion object {
lateinit var weakActivity: WeakReference<MainActivity>
init {
val socketName = "local.socket.address.listen.native.cmd2"
val s = Semaphore(0)
thread(name="stdout/stderr pipe") {
Log.d("SIMPLEX", "starting server")
val server = LocalServerSocket(socketName)
Log.d("SIMPLEX", "started server")
s.release()
val receiver = server.accept()
Log.d("SIMPLEX", "started receiver")
val logbuffer = FifoQueue<String>(500)
if (receiver != null) {
val inStream = receiver.inputStream
val inStreamReader = InputStreamReader(inStream)
val input = BufferedReader(inStreamReader)
while(true) {
val line = input.readLine() ?: break
Log.d("SIMPLEX (stdout/stderr)", line)
logbuffer.add(line)
}
}
}
System.loadLibrary("app-lib")
s.acquire()
pipeStdOutToSocket(socketName)
initHS()
Log.d("SIMPLEX (user)", user.toString())
try {
controller.apiStartChat()
Log.d("SIMPLEX", "started chat")
} catch(e: Error) {
Log.d("SIMPLEX", "failed starting chat $e")
// throw e
}
}
}
}
val chatModel by lazy {
val m = ChatModel(controller)
controller.setModel(m)
controller.startReceiver()
m
}
companion object {
lateinit var weakActivity: WeakReference<MainActivity>
init {
val socketName = "local.socket.address.listen.native.cmd2"
val s = Semaphore(0)
thread(name="stdout/stderr pipe") {
Log.d("SIMPLEX", "starting server")
val server = LocalServerSocket(socketName)
Log.d("SIMPLEX", "started server")
s.release()
val receiver = server.accept()
Log.d("SIMPLEX", "started receiver")
val logbuffer = FifoQueue<String>(500)
if (receiver != null) {
val inStream = receiver.inputStream
val inStreamReader = InputStreamReader(inStream)
val input = BufferedReader(inStreamReader)
while(true) {
val line = input.readLine() ?: break
Log.d("SIMPLEX (stdout/stderr)", line)
logbuffer.add(line)
}
}
}
System.loadLibrary("app-lib")
s.acquire()
pipeStdOutToSocket(socketName)
initHS()
}
}
}
class FifoQueue<E>(private var capacity: Int) : LinkedList<E>() {
override fun add(element: E): Boolean {
if(size > capacity) removeFirst()
return super.add(element)
}
override fun add(element: E): Boolean {
if(size > capacity) removeFirst()
return super.add(element)
}
}