Merge remote-tracking branch 'origin/master' into numpad_arrows

# Conflicts:
#	terminal-view/src/main/java/com/termux/view/TerminalView.java
This commit is contained in:
rakslice
2021-01-17 14:57:47 -08:00
3 changed files with 12 additions and 3 deletions

View File

@@ -14,6 +14,15 @@ Note that this repository is for the app itself (the user interface and the
terminal emulation). For the packages installable inside the app, see terminal emulation). For the packages installable inside the app, see
[termux/termux-packages](https://github.com/termux/termux-packages) [termux/termux-packages](https://github.com/termux/termux-packages)
***
**@termux is looking for Termux Application maintainer for implementing new features,
fixing bugs and reviewing pull requests since current one (@fornwall) is inactive.**
Issue https://github.com/termux/termux-app/issues/1072 needs extra attention.
***
## Installation ## Installation
Termux application can be obtained from: Termux application can be obtained from:

View File

@@ -17,8 +17,8 @@ android {
applicationId "com.termux" applicationId "com.termux"
minSdkVersion project.properties.minSdkVersion.toInteger() minSdkVersion project.properties.minSdkVersion.toInteger()
targetSdkVersion project.properties.targetSdkVersion.toInteger() targetSdkVersion project.properties.targetSdkVersion.toInteger()
versionCode 105 versionCode 106
versionName "0.105" versionName "0.106"
externalNativeBuild { externalNativeBuild {
ndkBuild { ndkBuild {

View File

@@ -1548,7 +1548,7 @@ public final class TerminalView extends View {
}; };
propsFile = new File(possiblePropLocations[0]); propsFile = new File(possiblePropLocations[0]);
int i = 1; int i = 0;
while (!propsFile.exists() && i < possiblePropLocations.length) { while (!propsFile.exists() && i < possiblePropLocations.length) {
propsFile = new File(possiblePropLocations[i]); propsFile = new File(possiblePropLocations[i]);
i += 1; i += 1;