Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

System wide STT service #161

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

System wide STT service #161

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
45515b8
First implementation of RecognitionService for testing and reviewing …
nebkrid Jan 23, 2023
63b65a0
Merge branch 'Stypox:master' into stt-service
nebkrid Feb 1, 2023
2eb87eb
- Bugfix: Breakdowns in background
nebkrid Feb 5, 2023
6cb85c5
- Added Sound Preference (choosable per package, for data privacy sec…
nebkrid Feb 7, 2023
a730a87
Renamed SpeechRecogServiceInputDevice
nebkrid Feb 9, 2023
9e46d32
Updated README.md for clarify different ways of STT service in android
nebkrid Feb 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 39 additions & 20 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:installLocation="auto"> <!-- Allow installing also on external storage -->
android:installLocation="auto" >

<!-- Allow installing also on external storage -->
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />

<!-- required by the download manager for APIs < Q -->
<uses-permission android:name="android.permission.RECORD_AUDIO" /> <!-- required by the download manager for APIs < Q -->
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion="28" />

<!-- the open skill needs to query all apps -->
android:maxSdkVersion="28" /> <!-- the open skill needs to query all apps -->
<uses-permission
android:name="android.permission.QUERY_ALL_PACKAGES"
tools:ignore="QueryAllPackagesPermission" />

<!-- the telephone skill needs to query contacts and call them -->
tools:ignore="QueryAllPackagesPermission" /> <!-- the telephone skill needs to query contacts and call them -->
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.CALL_PHONE" />

<queries><!--To access Speech recognizer via system interface on Android 11+
https://developer.android.com/reference/android/speech/SpeechRecognizer#createSpeechRecognizer(android.content.Context,%20android.content.ComponentName)-->
<intent>
<action
android:name="android.speech.RecognitionService" />
</intent>
</queries>

<application
android:name=".App"
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/full_backup_content"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/DarkAppTheme"
tools:ignore="GoogleAppIndexingWarning"
android:dataExtractionRules="@xml/data_extraction_rules">
tools:ignore="GoogleAppIndexingWarning" >

<activity
android:name=".MainActivity"
android:exported="true"
android:theme="@style/SplashScreenTheme"
android:windowSoftInputMode="stateUnspecified|adjustResize">
android:windowSoftInputMode="stateUnspecified|adjustResize" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>

<intent-filter>
<action android:name="android.intent.action.ASSIST" />
<category android:name="android.intent.category.DEFAULT" />
Expand All @@ -50,28 +52,45 @@
android:name="com.android.systemui.action_assist_icon"
android:resource="@mipmap/ic_launcher" />
</activity>

<activity
android:name=".settings.SettingsActivity"
android:exported="false" />

<activity
android:name=".error.ErrorActivity"
android:exported="false" />

<activity
android:name=".input.stt_service.SttServiceActivity"
android:taskAffinity=""
android:excludeFromRecents="true"
android:exported="true"
android:taskAffinity=""
android:theme="@style/SttServiceDarkAppTheme"
android:windowSoftInputMode="adjustResize">

android:windowSoftInputMode="adjustResize" >
<intent-filter>
<category android:name="android.intent.category.DEFAULT" />
<action android:name="android.speech.action.RECOGNIZE_SPEECH" />
</intent-filter>
</activity>

<service
android:name=".input.stt_service.SttService"
android:enabled="true"
android:exported="true"
android:description="@string/pref_input_method_vosk"
android:icon="@mipmap/ic_launcher"
android:permission="android.permission.RECORD_AUDIO"
>
<!-- TODO check the following tags whether these are helpful too -->
<!-- android:directBootAware=["true" | "false"]-->
<!-- android:foregroundServiceType="microphone" -->
<!-- android:label="string resource"-->
<intent-filter>
<action android:name="android.speech.RecognitionService"/>
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data
android:name="android.speech"
android:resource="@xml/stt_service_metadata" />
</service>
</application>

</manifest>
36 changes: 21 additions & 15 deletions app/src/main/java/org/stypox/dicio/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package org.stypox.dicio;

import static android.Manifest.permission.RECORD_AUDIO;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
Expand All @@ -13,23 +10,16 @@
import android.widget.ProgressBar;
import android.widget.ScrollView;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.widget.SearchView;
import androidx.appcompat.widget.Toolbar;
import androidx.core.app.ActivityCompat;
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.preference.PreferenceManager;

import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
import com.google.android.material.navigation.NavigationView;

import org.dicio.skill.output.GraphicalOutputDevice;
import org.dicio.skill.output.SpeechOutputDevice;
import org.stypox.dicio.eval.SkillEvaluator;
import org.stypox.dicio.eval.SkillRanker;
import org.stypox.dicio.input.InputDevice;
import org.stypox.dicio.input.SpeechInputDevice;
import org.stypox.dicio.input.SpeechRecogServiceInputDevice;
import org.stypox.dicio.input.ToolbarInputDevice;
import org.stypox.dicio.input.VoskInputDevice;
import org.stypox.dicio.input.stt_service.SttServiceActivity;
Expand All @@ -42,8 +32,19 @@
import org.stypox.dicio.skills.SkillHandler;
import org.stypox.dicio.util.BaseActivity;
import org.stypox.dicio.util.PermissionUtils;
import org.dicio.skill.output.GraphicalOutputDevice;
import org.dicio.skill.output.SpeechOutputDevice;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.widget.SearchView;
import androidx.appcompat.widget.Toolbar;
import androidx.core.app.ActivityCompat;
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.preference.PreferenceManager;

import static android.Manifest.permission.RECORD_AUDIO;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;

public class MainActivity extends BaseActivity
implements NavigationView.OnNavigationItemSelectedListener {
Expand Down Expand Up @@ -304,6 +305,11 @@ private InputDevice buildPrimaryInputDevice() {
.getString(getString(R.string.pref_key_input_method), "");
if (preference.equals(getString(R.string.pref_val_input_method_text))) {
return new ToolbarInputDevice();
} else if (preference.equals(getString(R.string.pref_val_input_method_systemStt))) {
//TODO make a hint/data privacy warning etc. in preference when this one is chosen that
// the speech dicio records is given to a third party app according to system
// settings
return new SpeechRecogServiceInputDevice(this);
} else { // default
return new VoskInputDevice(this);
}
Expand Down
Loading