expvintl/NeoTerm_System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: exitPrompt not public

Browse Source
This commit is contained in:
zt515 2017-12-09 00:09:30 +08:00
parent 84f734155b
commit b07a4b1a57
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/CMakeLists.txt
View File

@ -1,10 +1,11 @@
cmake_minimum_required(VERSION 3.4.1) cmake_minimum_required(VERSION 3.4.1)
add_library(neoterm add_library(neoterm
SHARED SHARED
src/main/cpp/neoterm.cpp) src/main/cpp/neoterm.cpp)
target_link_libraries(neoterm)
#add_library(nexec #add_library(nexec
# SHARED # SHARED
# src/main/cpp/exec.c) # src/main/cpp/exec.c)

2
app/src/main/cpp/neoterm.cpp
View File

@ -8,6 +8,8 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <termios.h> #include <termios.h>
#define __neoterm_no_return __attribute__((__noreturn__))
#define TERMUX_UNUSED(x) x __attribute__((__unused__)) #define TERMUX_UNUSED(x) x __attribute__((__unused__))
#ifdef __APPLE__ #ifdef __APPLE__
# define LACKS_PTSNAME_R # define LACKS_PTSNAME_R

5
app/src/main/java/io/neoterm/frontend/session/shell/ShellTermSession.kt
View File

@ -4,10 +4,9 @@ import android.content.Context
import io.neoterm.App import io.neoterm.App
import io.neoterm.R import io.neoterm.R
import io.neoterm.backend.TerminalSession import io.neoterm.backend.TerminalSession
import io.neoterm.frontend.preference.DefaultPreference
import io.neoterm.frontend.session.shell.client.TermSessionCallback
import io.neoterm.frontend.preference.NeoPreference import io.neoterm.frontend.preference.NeoPreference
import io.neoterm.frontend.preference.NeoTermPath import io.neoterm.frontend.preference.NeoTermPath
import io.neoterm.frontend.session.shell.client.TermSessionCallback
import java.io.File import java.io.File
/** /**
@ -19,7 +18,7 @@ open class ShellTermSession private constructor(shellPath: String, cwd: String,
val shellProfile: ShellProfile) val shellProfile: ShellProfile)
: TerminalSession(shellPath, cwd, args, env, changeCallback) { : TerminalSession(shellPath, cwd, args, env, changeCallback) {
private var exitPrompt = App.get().getString(R.string.process_exit_prompt) var exitPrompt = App.get().getString(R.string.process_exit_prompt)
override fun initializeEmulator(columns: Int, rows: Int) { override fun initializeEmulator(columns: Int, rows: Int) {
super.initializeEmulator(columns, rows) super.initializeEmulator(columns, rows)

2
app/src/main/java/io/neoterm/services/NeoTermService.kt
View File

@ -134,7 +134,7 @@ class NeoTermService : Service() {
builder.setShowWhen(false) builder.setShowWhen(false)
builder.color = 0xFF000000.toInt() builder.color = 0xFF000000.toInt()
builder.priority = if (lockAcquired) NotificationCompat.PRIORITY_HIGH else NotificationCompat.PRIORITY_MIN builder.priority = if (lockAcquired) Notification.PRIORITY_HIGH else Notification.PRIORITY_LOW
val exitIntent = Intent(this, NeoTermService::class.java).setAction(ACTION_SERVICE_STOP) val exitIntent = Intent(this, NeoTermService::class.java).setAction(ACTION_SERVICE_STOP)
builder.addAction(android.R.drawable.ic_delete, getString(R.string.exit), PendingIntent.getService(this, 0, exitIntent, 0)) builder.addAction(android.R.drawable.ic_delete, getString(R.string.exit), PendingIntent.getService(this, 0, exitIntent, 0))