From 64efa2210c06354eab6101840eee9fbf199039a9 Mon Sep 17 00:00:00 2001
From: uvlad7 <uvlad7@gmail.com>
Date: Sun, 6 Jun 2021 01:03:03 +0300
Subject: [PATCH] Fix bug in recognize settings realization, upgrade to sdk 30,
 disable unnecessary permissions

---
 app/build.gradle                                          | 4 ++--
 app/src/main/AndroidManifest.xml                          | 7 +++++--
 .../by/surdoteam/surdo/fragments/RecognizeFragment.java   | 8 ++++----
 app/src/main/res/values/strings.xml                       | 2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 49508ce..bd680e8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,12 +5,12 @@ import java.nio.file.Paths
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     buildToolsVersion "29.0.2"
     defaultConfig {
         applicationId "by.surdoteam.surdo"
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "0.4.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c9a5c37..6b7e7c9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,11 +2,14 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="by.surdoteam.surdo">
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <!--    is't required since API 19 for app dirs like-->
+    <!--     Context.getExternalCacheDir() -> /storage/emulated/0/Android/data/by.surdoteam.surdo/cache -->
+    <!--    Context.getExternalFilesDir(String) /storage/emulated/0/Android/data/by.surdoteam.surdo/files/String -->
+    <!--    and our case-->
+    <!--    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />-->
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application
-            android:requestLegacyExternalStorage="true"
             android:allowBackup="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
diff --git a/app/src/main/java/by/surdoteam/surdo/fragments/RecognizeFragment.java b/app/src/main/java/by/surdoteam/surdo/fragments/RecognizeFragment.java
index 18b8d9b..2b15bd4 100644
--- a/app/src/main/java/by/surdoteam/surdo/fragments/RecognizeFragment.java
+++ b/app/src/main/java/by/surdoteam/surdo/fragments/RecognizeFragment.java
@@ -50,6 +50,7 @@ public class RecognizeFragment extends Fragment implements RecognitionListener {
     private static final String KEYPHRASE = "активировать";
     /* Named searches allow to quickly reconfigure the decoder */
     private static final String PHRASE_SEARCH = "phrase";
+    private static String grammar_name;
     private SpeechRecognizer recognizer;
     private Pattern splitter;
     private int permissionCheck;
@@ -112,10 +113,10 @@ private void setupRecognizer(File assetsDir) throws IOException {
         // of different kind and switch between them
         SharedPreferences sharedPref = getActivity().getPreferences(Context.MODE_PRIVATE);
         int threshold = sharedPref.getInt("sensitivity_of_the_activation_phrase", 6);
-        String dict = sharedPref.getString("grammar_name", getString(R.string.grammar_name_default_value));
+        grammar_name = sharedPref.getString("grammar_name", getString(R.string.grammar_name_default_value));
         SpeechRecognizerSetup setup = SpeechRecognizerSetup.defaultSetup()
                 .setAcousticModel(new File(assetsDir, "ru-ru-ptm"))
-                .setDictionary(new File(assetsDir, dict))
+                .setDictionary(new File(assetsDir, "car.dict"))
                 .setBoolean("-remove_noise", true)
                 .setSampleRate(8000)
                 .setKeywordThreshold((float) Math.pow(10, -threshold));
@@ -134,8 +135,7 @@ private void setupRecognizer(File assetsDir) throws IOException {
 
         // Create keyword-activation search.
         recognizer.addKeyphraseSearch(KWS_SEARCH, KEYPHRASE);
-
-        File menuGrammar = new File(assetsDir, "car.gram");
+        File menuGrammar = new File(assetsDir, grammar_name);
         Log.d("File", menuGrammar.getAbsolutePath());
         StringBuilder sb = new StringBuilder("((?<=^| )(?:(?:");
         for (int i = 0; i < arguments.size(); i++) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b0f682b..1a2207d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,7 +9,7 @@
     <string name="sensitivity_of_the_activation_phrase">Чувствительность</string>
     <string name="sensitivity_of_the_activation_phrase_summary">Чувствительность распознавания активационной фразы</string>
     <string name="grammar_name">Грамматика</string>
-    <string name="grammar_name_summary">Выбор грамматики, используемой для распознавания</string>
+    <string name="grammar_name_summary">Выбор грамматики, используемой для распознавания. "Long" означает возможность распознавания нескольких фраз подряд</string>
     <string name="save_logs">Сохранять логи</string>
     <string name="save_logs_summary">Активировать сохранение логов распознавания. Занимает много места на устройстве!</string>