Require minSdkVersion 23 (was 21) to simply code (#105)

Kaljurand · web-flow · commit 206e82230c2b · 2023-04-08T20:43:04.000+02:00
Require minSdkVersion 23 (was 21) to simply code
diff --git a/app/build.gradle b/app/build.gradle
@@ -27,10 +27,10 @@ android {
     // API level 21: Jetpack Compose
     defaultConfig {
         applicationId 'ee.ioc.phon.android.speak'
-        minSdkVersion 21
+        minSdkVersion 23
         targetSdkVersion 33
-        versionCode 1817
-        versionName '1.8.17'
+        versionCode 1900
+        versionName '1.9.00'
         vectorDrawables.useSupportLibrary = true
         // Keep only en and et resources
         resConfigs 'en', 'et'
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/AppListCursorAdapter.java b/app/src/main/java/ee/ioc/phon/android/speak/AppListCursorAdapter.java
@@ -43,8 +43,8 @@
  */
 public class AppListCursorAdapter extends CursorAdapter {
 
-    private String mDefaultServerUrl;
-    private PackageManager mPm;
+    private final String mDefaultServerUrl;
+    private final PackageManager mPm;
 
     public AppListCursorAdapter(Context context, Cursor c, boolean autoRequery) {
         super(context, c, autoRequery);
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/Caller.java b/app/src/main/java/ee/ioc/phon/android/speak/Caller.java
@@ -70,7 +70,7 @@ public Caller(PendingIntent pendingIntent, Bundle bundle) {
         if (pendingIntent == null) {
             mPrimaryCaller = bundle.getString(RecognizerIntent.EXTRA_CALLING_PACKAGE);
         } else {
-            mPrimaryCaller = pendingIntent.getTargetPackage();
+            mPrimaryCaller = pendingIntent.getCreatorPackage();
         }
         mSecondaryCaller = getPackageName(bundle);
     }
@@ -120,7 +120,7 @@ public static String getCaller(ComponentName callingActivity, PendingIntent pend
                 return callingActivity.getPackageName();
             }
         } else {
-            return pendingIntent.getTargetPackage();
+            return pendingIntent.getCreatorPackage();
         }
         return null;
     }
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/QuickSettingsManager.java b/app/src/main/java/ee/ioc/phon/android/speak/QuickSettingsManager.java
@@ -21,8 +21,8 @@ public class QuickSettingsManager {
         COMBOS_MULTILINGUAL = Collections.unmodifiableSet(set);
     }
 
-    private SharedPreferences mPrefs;
-    private Resources mRes;
+    private final SharedPreferences mPrefs;
+    private final Resources mRes;
 
     public QuickSettingsManager(SharedPreferences prefs, Resources res) {
         mPrefs = prefs;
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/activity/AbstractRecognizerIntentActivity.java b/app/src/main/java/ee/ioc/phon/android/speak/activity/AbstractRecognizerIntentActivity.java
@@ -86,7 +86,7 @@ public abstract class AbstractRecognizerIntentActivity extends AppCompatActivity
 
     private Iterable<UtteranceRewriter> mRewriters;
 
-    private static SparseIntArray mErrorCodesServiceToIntent = IntentUtils.createErrorCodesServiceToIntent();
+    private static final SparseIntArray mErrorCodesServiceToIntent = IntentUtils.createErrorCodesServiceToIntent();
 
     private List<byte[]> mBufferList = new ArrayList<>();
 
@@ -580,7 +580,7 @@ private SparseArray<String> createErrorMessages() {
      */
     protected void setResultError(int errorCode) {
         if (mIsReturnErrors) {
-            Integer errorCodeIntent = mErrorCodesServiceToIntent.get(errorCode);
+            int errorCodeIntent = mErrorCodesServiceToIntent.get(errorCode);
             setResult(errorCodeIntent);
             finish();
         }
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/activity/DetailsActivity.java b/app/src/main/java/ee/ioc/phon/android/speak/activity/DetailsActivity.java
@@ -54,7 +54,7 @@ public void onCreate(Bundle savedInstanceState) {
         Bundle extras = intent.getExtras();
 
         if (extras == null) {
-            requestWindowFeature(Window.FEATURE_NO_TITLE);
+            supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
             mIsFinishAfterPlayAudio = true;
         }
 
@@ -66,7 +66,7 @@ public void onCreate(Bundle savedInstanceState) {
         if (extras != null) {
             String title = extras.getString(EXTRA_TITLE);
             if (title == null) {
-                requestWindowFeature(Window.FEATURE_NO_TITLE);
+                supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
             } else {
                 setTitle(title);
             }
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/activity/RewritesLoaderActivity.java b/app/src/main/java/ee/ioc/phon/android/speak/activity/RewritesLoaderActivity.java
@@ -31,7 +31,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -113,11 +113,7 @@ public void onCreate(Bundle savedInstanceState) {
                 if (uri != null) {
                     if ("k6".equals(uri.getScheme())) {
                         byte[] data = Base64.decode(uri.getSchemeSpecificPart().substring(2), Base64.NO_WRAP | Base64.URL_SAFE);
-                        try {
-                            utteranceRewriter = new UtteranceRewriter(new String(data, "UTF-8"));
-                        } catch (UnsupportedEncodingException e) {
-                            // TODO: dont ignore
-                        }
+                        utteranceRewriter = new UtteranceRewriter(new String(data, StandardCharsets.UTF_8));
                     } else {
                         utteranceRewriter = loadFromUri(uri);
                     }
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/activity/ServerListActivity.java b/app/src/main/java/ee/ioc/phon/android/speak/activity/ServerListActivity.java
@@ -32,7 +32,7 @@ public class ServerListActivity extends AbstractContentActivity {
             Server.Columns.URL
     };
 
-    private static int[] TO = new int[]{
+    private static final int[] TO = new int[]{
             R.id.itemServerId,
             R.id.itemServerUrl
     };
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/demo/EncoderListDemo.kt b/app/src/main/java/ee/ioc/phon/android/speak/demo/EncoderListDemo.kt
@@ -6,7 +6,6 @@ import android.widget.ListView
 import androidx.appcompat.app.AppCompatActivity
 import ee.ioc.phon.android.speak.R
 import ee.ioc.phon.android.speechutils.utils.AudioUtils
-import java.util.*
 
 class EncoderListDemo : AppCompatActivity() {
 
@@ -17,7 +16,7 @@ class EncoderListDemo : AppCompatActivity() {
         val mime = "audio/flac"
         info.add(mime + " encoders: " + AudioUtils.getEncoderNamesForType(mime).toString())
         info.addAll(AudioUtils.getAvailableEncoders(mime, 16000))
-        val listView = findViewById(android.R.id.list) as ListView
+        val listView = findViewById<ListView>(android.R.id.list)
         listView.adapter = ArrayAdapter(this, R.layout.list_item_detail, info.toTypedArray())
     }
 }
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/demo/HandsfreeDemoActivity.kt b/app/src/main/java/ee/ioc/phon/android/speak/demo/HandsfreeDemoActivity.kt
@@ -81,18 +81,22 @@ class HandsfreeDemoActivity : AbstractRecognizerDemoActivity() {
 
 
     private fun updateListView(list: List<String>) {
-        (findViewById<View>(R.id.list_matches) as ListView).adapter = ArrayAdapter(this, android.R.layout.simple_list_item_1, list)
+        (findViewById<View>(R.id.list_matches) as ListView).adapter =
+            ArrayAdapter(this, android.R.layout.simple_list_item_1, list)
     }
 
     companion object {
 
         // TODO: smaller values (e.g. < 800) cause an error with the local server with a single slot
-        private val SLEEP_TIME = 10
-        private val MAX_COUNT = 5
+        private const val SLEEP_TIME = 10
+        private const val MAX_COUNT = 5
 
         private fun createRecognizerIntent(): Intent {
             val intent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
-            intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
+            intent.putExtra(
+                RecognizerIntent.EXTRA_LANGUAGE_MODEL,
+                RecognizerIntent.LANGUAGE_MODEL_FREE_FORM
+            )
             intent.putExtra(RecognizerIntent.EXTRA_MAX_RESULTS, 3)
             intent.putExtra(Extras.EXTRA_AUTO_START, true)
             intent.putExtra(Extras.EXTRA_RETURN_ERRORS, true)
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/demo/ImeListDemo.kt b/app/src/main/java/ee/ioc/phon/android/speak/demo/ImeListDemo.kt
@@ -11,7 +11,6 @@ import android.widget.ListView
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import ee.ioc.phon.android.speak.R
-import java.util.*
 
 class ImeListDemo : AppCompatActivity() {
 
@@ -22,7 +21,7 @@ class ImeListDemo : AppCompatActivity() {
         val mngr = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
         val info = getVoiceImeInputMethodInfo(packageManager, mngr)
 
-        val listView = findViewById(android.R.id.list) as ListView
+        val listView = findViewById<ListView>(android.R.id.list)
         listView.adapter = ArrayAdapter(this, R.layout.list_item_detail, info.toTypedArray())
 
         listView.onItemClickListener = OnItemClickListener { _, view, _, _ ->
@@ -33,10 +32,13 @@ class ImeListDemo : AppCompatActivity() {
     }
 
     companion object {
-        private val VOICE_IME_SUBTYPE_MODE = "voice"
+        private const val VOICE_IME_SUBTYPE_MODE = "voice"
 
         @Throws(SecurityException::class, IllegalArgumentException::class)
-        private fun getVoiceImeInputMethodInfo(pm: PackageManager, inputMethodManager: InputMethodManager): List<String> {
+        private fun getVoiceImeInputMethodInfo(
+            pm: PackageManager,
+            inputMethodManager: InputMethodManager
+        ): List<String> {
             val imeInfos = ArrayList<String>()
             for (inputMethodInfo in inputMethodManager.enabledInputMethodList) {
                 for (i in 0 until inputMethodInfo.subtypeCount) {
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/demo/SimpleDemo.kt b/app/src/main/java/ee/ioc/phon/android/speak/demo/SimpleDemo.kt
@@ -40,11 +40,14 @@ class SimpleDemo : AbstractRecognizerDemoActivity() {
 
         val intent = createRecognizerIntent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
 
-        if (getRecognizers(intent).size == 0) {
+        if (getRecognizers(intent).isEmpty()) {
             toast(getString(R.string.errorRecognizerNotPresent))
             finish()
         } else {
-            intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
+            intent.putExtra(
+                RecognizerIntent.EXTRA_LANGUAGE_MODEL,
+                RecognizerIntent.LANGUAGE_MODEL_FREE_FORM
+            )
             intent.putExtra(RecognizerIntent.EXTRA_MAX_RESULTS, 3)
             launchRecognizerIntent(intent)
         }
@@ -55,7 +58,7 @@ class SimpleDemo : AbstractRecognizerDemoActivity() {
      */
     override fun onSuccess(intent: Intent?) {
         val matches = intent?.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)
-        (findViewById(android.R.id.list) as ListView).adapter =
-                ArrayAdapter(this, android.R.layout.simple_list_item_1, matches as ArrayList<String>)
+        (findViewById<ListView>(android.R.id.list)).adapter =
+            ArrayAdapter(this, android.R.layout.simple_list_item_1, matches as ArrayList<String>)
     }
 }
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/demo/VoiceSearchDemo.kt b/app/src/main/java/ee/ioc/phon/android/speak/demo/VoiceSearchDemo.kt
@@ -36,8 +36,8 @@ class VoiceSearchDemo : AbstractRecognizerDemoActivity() {
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.voice_search_demo)
-        val speakButton = findViewById(R.id.buttonMicrophone) as ImageButton
-        speakButton.setOnClickListener({ launchRecognizerIntent(createVoiceAppSearchIntent()) })
+        val speakButton = findViewById<ImageButton>(R.id.buttonMicrophone)
+        speakButton.setOnClickListener { launchRecognizerIntent(createVoiceAppSearchIntent()) }
     }
 
     override fun onSuccess(intent: Intent?) {
@@ -65,7 +65,10 @@ class VoiceSearchDemo : AbstractRecognizerDemoActivity() {
         val queryExtras = Bundle()
 
         val voiceIntent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
-        voiceIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
+        voiceIntent.putExtra(
+            RecognizerIntent.EXTRA_LANGUAGE_MODEL,
+            RecognizerIntent.LANGUAGE_MODEL_FREE_FORM
+        )
         //voiceIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, (String) null);
         voiceIntent.putExtra(RecognizerIntent.EXTRA_MAX_RESULTS, 1)
         // Add the values that configure forwarding the results
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/provider/AppsContentProvider.java b/app/src/main/java/ee/ioc/phon/android/speak/provider/AppsContentProvider.java
@@ -58,9 +58,9 @@ public class AppsContentProvider extends ContentProvider {
 	private static final int SERVERS = 5;
 	private static final int SERVER_ID = 6;
 
-	private static HashMap<String, String> appsProjectionMap;
-	private static HashMap<String, String> grammarsProjectionMap;
-	private static HashMap<String, String> serversProjectionMap;
+	private static final HashMap<String, String> appsProjectionMap;
+	private static final HashMap<String, String> grammarsProjectionMap;
+	private static final HashMap<String, String> serversProjectionMap;
 
 	private DatabaseHelper dbHelper;
 
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/service/WebSocketRecognitionService.java b/app/src/main/java/ee/ioc/phon/android/speak/service/WebSocketRecognitionService.java
@@ -1,5 +1,7 @@
 package ee.ioc.phon.android.speak.service;
 
+import static android.Manifest.permission.RECORD_AUDIO;
+
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
@@ -32,8 +34,6 @@
 import ee.ioc.phon.android.speechutils.service.AbstractRecognitionService;
 import ee.ioc.phon.android.speechutils.utils.PreferenceUtils;
 
-import static android.Manifest.permission.RECORD_AUDIO;
-
 /**
  * Implements RecognitionService, connects to the server via WebSocket.
  */
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/utils/QueryUtils.java b/app/src/main/java/ee/ioc/phon/android/speak/utils/QueryUtils.java
@@ -8,6 +8,7 @@
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import ee.ioc.phon.android.speak.ChunkedWebRecSessionBuilder;
 import ee.ioc.phon.android.speak.Log;
@@ -35,7 +36,7 @@ public static List<Pair<String, String>> getQueryParams(Intent intent, ChunkedWe
         List<Pair<String, String>> list = new ArrayList<>();
         flattenBundle("editorInfo_", list, intent.getBundleExtra(Extras.EXTRA_EDITOR_INFO));
         listAdd(list, "lang", builder.getLang());
-        listAdd(list, "lm", toString(builder.getGrammarUrl()));
+        listAdd(list, "lm", Objects.toString(builder.getGrammarUrl(), ""));
         listAdd(list, "output-lang", builder.getGrammarTargetLang());
         listAdd(list, "user-agent", builder.getUserAgentComment());
         listAdd(list, "calling-package", builder.getCaller());
@@ -44,11 +45,10 @@ public static List<Pair<String, String>> getQueryParams(Intent intent, ChunkedWe
         return list;
     }
 
-    private static boolean listAdd(List<Pair<String, String>> list, String key, String value) {
-        if (value == null || value.length() == 0) {
-            return false;
+    private static void listAdd(List<Pair<String, String>> list, String key, String value) {
+        if (value != null && value.length() > 0) {
+            list.add(new Pair<>(key, value));
         }
-        return list.add(new Pair<>(key, value));
     }
 
     private static void flattenBundle(String prefix, List<Pair<String, String>> list, Bundle bundle) {
@@ -59,21 +59,13 @@ private static void flattenBundle(String prefix, List<Pair<String, String>> list
                     if (value instanceof Bundle) {
                         flattenBundle(prefix + key + "_", list, (Bundle) value);
                     } else {
-                        listAdd(list, prefix + key, toString(value));
+                        listAdd(list, prefix + key, Objects.toString(value, ""));
                     }
                 }
             }
         }
     }
 
-    // TODO: replace by a built-in
-    private static String toString(Object obj) {
-        if (obj == null) {
-            return null;
-        }
-        return obj.toString();
-    }
-
     /**
      * Returns a String that is suitable for use as an <code>application/x-www-form-urlencoded</code>
      * list of parameters in an HTTP PUT or HTTP POST.
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/view/ComboSelectorView.kt b/app/src/main/java/ee/ioc/phon/android/speak/view/ComboSelectorView.kt
@@ -63,7 +63,7 @@ class ComboSelectorView @JvmOverloads constructor(
         val mBComboSelector = findViewById<Button>(R.id.tvComboSelector)
         val mRvComboButtons: RecyclerView = findViewById(R.id.rvComboButtons)
         val size = mSlc.size()
-        if (size >= mMinButtons && mMinButtons > 0) {
+        if (mMinButtons in (1..size)) {
             // We show buttons if the user has requested at least one button (by default at least 3),
             // and there are at least that many to show.
             mBComboSelector.visibility = GONE
@@ -94,7 +94,7 @@ class ComboSelectorView @JvmOverloads constructor(
                 val combo = Combo(context, mSlc.combo)
                 mBComboSelector.text = combo.longLabel
             }
-            mBComboSelector.setOnLongClickListener { view: View? ->
+            mBComboSelector.setOnLongClickListener {
                 comboSelector(context, key)
                 true
             }
@@ -108,7 +108,7 @@ class ComboSelectorView @JvmOverloads constructor(
     }
 
     fun click() {
-        mListener.onComboChange(mSlc.language, mSlc.service);
+        mListener.onComboChange(mSlc.language, mSlc.service)
     }
 
     val speechRecognizer: SpeechRecognizer
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/view/OnCursorTouchListener.java b/app/src/main/java/ee/ioc/phon/android/speak/view/OnCursorTouchListener.java
@@ -46,7 +46,7 @@ public void run() {
             mHandler.postDelayed(this, DELAY);
         }
     };
-    private Runnable mTask2 = new Runnable() {
+    private final Runnable mTask2 = new Runnable() {
         public void run() {
             onMoveAux(1, 1);
             mHandler.postDelayed(this, DELAY);
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/view/OnPressAndHoldListener.java b/app/src/main/java/ee/ioc/phon/android/speak/view/OnPressAndHoldListener.java
@@ -33,7 +33,7 @@ public boolean onTouch(View v, MotionEvent event) {
             case MotionEvent.ACTION_UP:
             case MotionEvent.ACTION_OUTSIDE:
             case MotionEvent.ACTION_CANCEL:
-                if (mHandler != null) mHandler.removeCallbacks(mTask);
+                mHandler.removeCallbacks(mTask);
                 v.setPressed(false);
                 break;
             default:
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
@@ -284,8 +284,6 @@
     <string name="summaryReturnErrors">Tagasta audio/võrgu/jne vigade teated kutsuvale rakendusele</string>
     <string name="titleImeShowPartialResults">Vahetulemused</string>
     <string name="summaryImeShowPartialResults">Näita tekstikastis kõnetuvastuse vahetulemusi</string>
-    <string name="summaryImeHelpText">Näita klaviatuuril abiteksti (teeb klaviatuuri sellevõrra suuremaks)</string>
-    <string name="titleImeHelpText">Abitekst</string>
     <string name="dialogTitleCombo">Keeled &amp; teenused</string>
     <string name="titleCombo">Kõnetuvastuskeeled &amp; teenused</string>
     <string name="summaryImeCombo">Uuendan…</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -86,8 +86,6 @@
     <string name="summaryHelpText">Show usage instructions by the microphone button. Makes the search panel larger.</string>
     <string name="titleReturnErrors">Return errors</string>
     <string name="summaryReturnErrors">Return network/audio/etc. errors to the caller (useful if the caller does error handling)</string>
-    <string name="titleImeHelpText">Help text</string>
-    <string name="summaryImeHelpText">Show usage instructions by the microphone button. Makes the keyboard larger.</string>
     <string name="summaryImeCombo">Updating…</string>
     <string name="titleEnableIme">Enable Speak &amp; swipe keyboard</string>
     <string name="summaryEnableIme">The keyboard allows you to dictate into any text field in any app, and navigate and edit the text with swipe operations. Tap here to enable it in the Android virtual keyboard settings.</string>
diff --git a/speechutils b/speechutils

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public Caller(PendingIntent pendingIntent, Bundle bundle) {`
`70`	`70`	`if (pendingIntent == null) {`
`71`	`71`	`mPrimaryCaller = bundle.getString(RecognizerIntent.EXTRA_CALLING_PACKAGE);`
`72`	`72`	`} else {`
`73`		`- mPrimaryCaller = pendingIntent.getTargetPackage();`
	`73`	`+ mPrimaryCaller = pendingIntent.getCreatorPackage();`
`74`	`74`	`}`
`75`	`75`	`mSecondaryCaller = getPackageName(bundle);`
`76`	`76`	`}`
`@@ -120,7 +120,7 @@ public static String getCaller(ComponentName callingActivity, PendingIntent pend`
`120`	`120`	`return callingActivity.getPackageName();`
`121`	`121`	`}`
`122`	`122`	`} else {`
`123`		`- return pendingIntent.getTargetPackage();`
	`123`	`+ return pendingIntent.getCreatorPackage();`
`124`	`124`	`}`
`125`	`125`	`return null;`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ public class QuickSettingsManager {`
`21`	`21`	`COMBOS_MULTILINGUAL = Collections.unmodifiableSet(set);`
`22`	`22`	`}`
`23`	`23`
`24`		`- private SharedPreferences mPrefs;`
`25`		`- private Resources mRes;`
	`24`	`+ private final SharedPreferences mPrefs;`
	`25`	`+ private final Resources mRes;`
`26`	`26`
`27`	`27`	`public QuickSettingsManager(SharedPreferences prefs, Resources res) {`
`28`	`28`	`mPrefs = prefs;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ import android.widget.ListView`
`6`	`6`	`import androidx.appcompat.app.AppCompatActivity`
`7`	`7`	`import ee.ioc.phon.android.speak.R`
`8`	`8`	`import ee.ioc.phon.android.speechutils.utils.AudioUtils`
`9`		`-import java.util.*`
`10`	`9`
`11`	`10`	`class EncoderListDemo : AppCompatActivity() {`
`12`	`11`
`@@ -17,7 +16,7 @@ class EncoderListDemo : AppCompatActivity() {`
`17`	`16`	`val mime = "audio/flac"`
`18`	`17`	`info.add(mime + " encoders: " + AudioUtils.getEncoderNamesForType(mime).toString())`
`19`	`18`	`info.addAll(AudioUtils.getAvailableEncoders(mime, 16000))`
`20`		`- val listView = findViewById(android.R.id.list) as ListView`
	`19`	`+ val listView = findViewById<ListView>(android.R.id.list)`
`21`	`20`	`listView.adapter = ArrayAdapter(this, R.layout.list_item_detail, info.toTypedArray())`
`22`	`21`	`}`
`23`	`22`	`}`