Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ce7ad530cd | ||
|
|
d0015cbe82 | ||
|
|
9e19217f8f | ||
|
|
048af64093 | ||
|
|
a8f7bf1b6e | ||
|
|
62e229e184 |
@@ -18,8 +18,8 @@ android {
|
|||||||
applicationId "com.termux"
|
applicationId "com.termux"
|
||||||
minSdkVersion 21
|
minSdkVersion 21
|
||||||
targetSdkVersion 23
|
targetSdkVersion 23
|
||||||
versionCode 28
|
versionCode 29
|
||||||
versionName "0.28"
|
versionName "0.29"
|
||||||
}
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
|||||||
@@ -525,6 +525,10 @@ public final class TermuxActivity extends Activity implements ServiceConnection
|
|||||||
}
|
}
|
||||||
|
|
||||||
registerReceiver(mBroadcastReceiever, new IntentFilter(RELOAD_STYLE_ACTION));
|
registerReceiver(mBroadcastReceiever, new IntentFilter(RELOAD_STYLE_ACTION));
|
||||||
|
|
||||||
|
// The current terminal session may have changed while being away, force
|
||||||
|
// a refresh of the displayed terminal:
|
||||||
|
mTerminalView.onScreenUpdated();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -182,7 +182,7 @@ final class TermuxInstaller {
|
|||||||
if (arch.startsWith("arm") || arch.equals("aarch64")) {
|
if (arch.startsWith("arm") || arch.equals("aarch64")) {
|
||||||
// Handle different arm variants such as armv7l:
|
// Handle different arm variants such as armv7l:
|
||||||
arch = "arm";
|
arch = "arm";
|
||||||
} else if (arch.equals("x86_64")) {
|
} else if (arch.startsWith("x86")) { // "x86" on arcwelder, "x86_64" on 64-bit android.
|
||||||
arch = "i686";
|
arch = "i686";
|
||||||
}
|
}
|
||||||
return new URL("https://termux.net/bootstrap/bootstrap-" + arch + ".zip");
|
return new URL("https://termux.net/bootstrap/bootstrap-" + arch + ".zip");
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import android.database.Cursor;
|
|||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.ParcelFileDescriptor;
|
import android.os.ParcelFileDescriptor;
|
||||||
import android.support.annotation.NonNull;
|
import android.support.annotation.NonNull;
|
||||||
|
import android.webkit.MimeTypeMap;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
@@ -15,7 +16,7 @@ import java.io.FileNotFoundException;
|
|||||||
public class TermuxFilePickerProvider extends ContentProvider {
|
public class TermuxFilePickerProvider extends ContentProvider {
|
||||||
@Override
|
@Override
|
||||||
public boolean onCreate() {
|
public boolean onCreate() {
|
||||||
return false;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -25,7 +26,20 @@ public class TermuxFilePickerProvider extends ContentProvider {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getType(@NonNull Uri uri) {
|
public String getType(@NonNull Uri uri) {
|
||||||
return null;
|
String contentType = null;
|
||||||
|
String path = uri.getPath();
|
||||||
|
int lastDotIndex = path.lastIndexOf('.');
|
||||||
|
String possibleFileExtension = path.substring(lastDotIndex + 1, path.length());
|
||||||
|
if (possibleFileExtension.contains("/")) {
|
||||||
|
// The dot was in the path, so not a file extension.
|
||||||
|
} else {
|
||||||
|
MimeTypeMap mimeTypes = MimeTypeMap.getSingleton();
|
||||||
|
// Lower casing makes it work with e.g. "JPG":
|
||||||
|
contentType = mimeTypes.getMimeTypeFromExtension(possibleFileExtension.toLowerCase());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (contentType == null) contentType = "application/octet-stream";
|
||||||
|
return contentType;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ import java.util.Properties;
|
|||||||
public final class TerminalView extends View {
|
public final class TerminalView extends View {
|
||||||
|
|
||||||
/** Log view key and IME events. */
|
/** Log view key and IME events. */
|
||||||
private static final boolean LOG_KEY_EVENTS = true;
|
private static final boolean LOG_KEY_EVENTS = false;
|
||||||
|
|
||||||
/** The currently displayed terminal session, whose emulator is {@link #mEmulator}. */
|
/** The currently displayed terminal session, whose emulator is {@link #mEmulator}. */
|
||||||
TerminalSession mTermSession;
|
TerminalSession mTermSession;
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
<string name="help">Help</string>
|
<string name="help">Help</string>
|
||||||
|
|
||||||
<string name="welcome_dialog_title">Welcome to Termux</string>
|
<string name="welcome_dialog_title">Welcome to Termux</string>
|
||||||
<string name="welcome_dialog_body">Long press anywhere on the terminal for a context menu where Help is available.\n\nExecute \'apt update\' to update the packages list before installing packages.</string>
|
<string name="welcome_dialog_body">Long press and select <i>More…</i> to show a menu where <i>Help</i> is available.\n\nExecute <b>apt update</b> to update the packages list before installing packages.</string>
|
||||||
<string name="welcome_dialog_dont_show_again_button">Do not show again</string>
|
<string name="welcome_dialog_dont_show_again_button">Do not show again</string>
|
||||||
|
|
||||||
<string name="bootstrap_installer_body">Installing…</string>
|
<string name="bootstrap_installer_body">Installing…</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user