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 e7bb2cc5a4363401928379ceaa634863439e8cf6..60c24f1ddb365dc9794e38d6f426a7a76bc2d4fa 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 824fdf671fb9f9a80b1eb481dad7e177eb8450a3..d6d3a8808ac488101f4ca74b346cb0cbd350d1ab 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 db2b7245c94a774dfe17e1eaa5028009dd02d436..786ae1486f48b604d45a323c80a609370021b91b 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>