Fixed: Fix NullPointerException in TermuxFloatSessionClient.checkForFontAndColors()

agnostic-apollo · agnostic-apollo · commit 4e9f15494d49 · 2024-08-12T17:49:16.000+05:00
```
com.termux.window E/Logger.TermuxFloatSessionClient: Error in checkForFontAndColors():
    java.lang.NullPointerException: Attempt to invoke virtual method 'com.termux.terminal.TerminalSession com.termux.shared.termux.shell.command.runner.terminal.TermuxSession.getTerminalSession()' on a null object reference
        at com.termux.window.TermuxFloatSessionClient.checkForFontAndColors(TermuxFloatSessionClient.java:166)
        at com.termux.window.TermuxFloatSessionClient.onReload(TermuxFloatSessionClient.java:66)
        at com.termux.window.TermuxFloatView.reloadViewStyling(TermuxFloatView.java:361)
        at com.termux.window.TermuxFloatService.createTermuxSession(TermuxFloatService.java:235)
        at com.termux.window.TermuxFloatService.initializeFloatView(TermuxFloatService.java:179)
        at com.termux.window.TermuxFloatService.onStartCommand(TermuxFloatService.java:55)
        at android.app.ActivityThread.handleServiceArgs(ActivityThread.java:4320)
        at android.app.ActivityThread.access$1800(ActivityThread.java:237)
        at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1951)
        at android.os.Handler.dispatchMessage(Handler.java:106)
        at android.os.Looper.loop(Looper.java:223)
        at android.app.ActivityThread.main(ActivityThread.java:7664)
        at java.lang.reflect.Method.invoke(Native Method)
        at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:592)
        at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:947)
```
diff --git a/app/src/main/java/com/termux/window/TermuxFloatService.java b/app/src/main/java/com/termux/window/TermuxFloatService.java
@@ -22,6 +22,7 @@
 import com.termux.shared.shell.TermuxShellEnvironmentClient;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_FLOAT_APP.TERMUX_FLOAT_SERVICE;
+import com.termux.terminal.TerminalSession;
 
 public class TermuxFloatService extends Service {
 
@@ -237,8 +238,12 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
         return newTermuxSession;
     }
 
-    public TermuxSession getSession() {
+    public TermuxSession getTermuxSession() {
         return mSession;
     }
 
+    public TerminalSession getCurrentSession() {
+        return mSession != null ? mSession.getTerminalSession() : null;
+    }
+
 }
diff --git a/app/src/main/java/com/termux/window/TermuxFloatSessionClient.java b/app/src/main/java/com/termux/window/TermuxFloatSessionClient.java
@@ -163,10 +163,11 @@ public void checkForFontAndColors() {
             }
 
             TerminalColors.COLOR_SCHEME.updateWith(props);
-            TerminalSession session = mService.getSession().getTerminalSession();
+            TerminalSession session = mService.getCurrentSession();
             if (session != null && session.getEmulator() != null) {
                 session.getEmulator().mColors.reset();
             }
+
             updateBackgroundColor();
 
             final Typeface newTypeface = (fontFile.exists() && fontFile.length() > 0) ? Typeface.createFromFile(fontFile) : Typeface.MONOSPACE;
@@ -178,7 +179,8 @@ public void checkForFontAndColors() {
 
     public void updateBackgroundColor() {
         //if (!mView.isVisible()) return;
-        TerminalSession session = mService.getSession().getTerminalSession();
+
+        TerminalSession session = mService.getCurrentSession();
         if (session != null && session.getEmulator() != null) {
             mView.getTerminalView().setBackgroundColor(session.getEmulator().mColors.mCurrentColors[TextStyle.COLOR_INDEX_BACKGROUND]);
         }

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`import com.termux.shared.shell.TermuxShellEnvironmentClient;`
`23`	`23`	`import com.termux.shared.termux.TermuxConstants;`
`24`	`24`	`import com.termux.shared.termux.TermuxConstants.TERMUX_FLOAT_APP.TERMUX_FLOAT_SERVICE;`
	`25`	`+import com.termux.terminal.TerminalSession;`
`25`	`26`
`26`	`27`	`public class TermuxFloatService extends Service {`
`27`	`28`
`@@ -237,8 +238,12 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution`
`237`	`238`	`return newTermuxSession;`
`238`	`239`	`}`
`239`	`240`
`240`		`- public TermuxSession getSession() {`
	`241`	`+ public TermuxSession getTermuxSession() {`
`241`	`242`	`return mSession;`
`242`	`243`	`}`
`243`	`244`
	`245`	`+ public TerminalSession getCurrentSession() {`
	`246`	`+ return mSession != null ? mSession.getTerminalSession() : null;`
	`247`	`+ }`
	`248`	`+`
`244`	`249`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,10 +163,11 @@ public void checkForFontAndColors() {`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`TerminalColors.COLOR_SCHEME.updateWith(props);`
`166`		`- TerminalSession session = mService.getSession().getTerminalSession();`
	`166`	`+ TerminalSession session = mService.getCurrentSession();`
`167`	`167`	`if (session != null && session.getEmulator() != null) {`
`168`	`168`	`session.getEmulator().mColors.reset();`
`169`	`169`	`}`
	`170`	`+`
`170`	`171`	`updateBackgroundColor();`
`171`	`172`
`172`	`173`	`final Typeface newTypeface = (fontFile.exists() && fontFile.length() > 0) ? Typeface.createFromFile(fontFile) : Typeface.MONOSPACE;`
`@@ -178,7 +179,8 @@ public void checkForFontAndColors() {`
`178`	`179`
`179`	`180`	`public void updateBackgroundColor() {`
`180`	`181`	`//if (!mView.isVisible()) return;`
`181`		`- TerminalSession session = mService.getSession().getTerminalSession();`
	`182`	`+`
	`183`	`+ TerminalSession session = mService.getCurrentSession();`
`182`	`184`	`if (session != null && session.getEmulator() != null) {`
`183`	`185`	`mView.getTerminalView().setBackgroundColor(session.getEmulator().mColors.mCurrentColors[TextStyle.COLOR_INDEX_BACKGROUND]);`
`184`	`186`	`}`