From cf82b2374a059a8323c8ad3ab8734df9283e240f Mon Sep 17 00:00:00 2001
From: Francesco Andreuzzi <andreuzzi.francesco@gmail.com>
Date: Sat, 19 Aug 2017 12:18:40 +0200
Subject: [PATCH] 6.2a
---
.../andre/consolelauncher/commands/main/raw/call.java | 9 ++++++++-
.../consolelauncher/commands/tuixt/TuixtActivity.java | 8 +++++++-
app/src/main/res/values/strings.xml | 1 +
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/ohi/andre/consolelauncher/commands/main/raw/call.java b/app/src/main/java/ohi/andre/consolelauncher/commands/main/raw/call.java
index e7bb2cc..60c24f1 100755
--- a/app/src/main/java/ohi/andre/consolelauncher/commands/main/raw/call.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/commands/main/raw/call.java
@@ -13,6 +13,7 @@ import ohi.andre.consolelauncher.R;
import ohi.andre.consolelauncher.commands.CommandAbstraction;
import ohi.andre.consolelauncher.commands.ExecutePack;
import ohi.andre.consolelauncher.commands.main.MainPack;
+import ohi.andre.consolelauncher.tuils.Tuils;
public class call implements CommandAbstraction {
@@ -27,7 +28,13 @@ public class call implements CommandAbstraction {
}
String number = info.get(String.class, 0);
- Uri uri = Uri.parse("tel:" + number);
+ String s = Tuils.EMPTYSTRING;
+ for(char c : number.toCharArray()) {
+ if(c == '#') s += Uri.encode("#");
+ else s += c;
+ }
+
+ Uri uri = Uri.parse("tel:" + s);
Intent intent = new Intent(Intent.ACTION_CALL, uri);
try {
diff --git a/app/src/main/java/ohi/andre/consolelauncher/commands/tuixt/TuixtActivity.java b/app/src/main/java/ohi/andre/consolelauncher/commands/tuixt/TuixtActivity.java
index 824fdf6..d6d3a88 100755
--- a/app/src/main/java/ohi/andre/consolelauncher/commands/tuixt/TuixtActivity.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/commands/tuixt/TuixtActivity.java
@@ -20,6 +20,7 @@ import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.TextView;
+import android.widget.Toast;
import java.io.BufferedReader;
import java.io.File;
@@ -210,7 +211,12 @@ public class TuixtActivity extends Activity {
runOnUiThread(new Runnable() {
@Override
public void run() {
- fileView.setText(builder.toString());
+ try {
+ fileView.setText(builder.toString());
+ } catch (OutOfMemoryError e) {
+ fileView.setText(Tuils.EMPTYSTRING);
+ Toast.makeText(TuixtActivity.this, R.string.tuixt_error, Toast.LENGTH_LONG).show();
+ }
}
});
} catch (Exception e) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index db2b724..786ae14 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -69,6 +69,7 @@
<string name="tuixt_saved">Saved</string>
<string name="tuixt_reading">Reading</string>
<string name="tuixt_label">TUIXT</string>
+ <string name="tuixt_error">This file is too big, consider opening it with an other text editor</string>
<!-- phone -->
<string name="output_wifi">WiFi active:</string>
--
GitLab