Merge pull request #12 from RIP95/master

Attempt to fix app for android < 5.0
This commit is contained in:
Nille 2017-03-05 02:18:52 +01:00 committed by GitHub
commit 3b62d5849c
1 changed files with 11 additions and 9 deletions

View File

@ -69,17 +69,19 @@ public class MainActivity extends AppCompatActivity {
kurisu.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
MainActivity host = (MainActivity) view.getContext();
if (Build.VERSION.SDK_INT >= 23) {
MainActivity host = (MainActivity) view.getContext();
int permissionCheck = ContextCompat.checkSelfPermission(host,
Manifest.permission.RECORD_AUDIO);
int permissionCheck = ContextCompat.checkSelfPermission(host,
Manifest.permission.RECORD_AUDIO);
/* Input while loop producing bugs and mixes with output */
if (!isLoop && !isSpeaking) {
if (permissionCheck == PackageManager.PERMISSION_GRANTED) {
promptSpeechInput();
} else {
speak(new VoiceLine(R.raw.daga_kotowaru, Mood.PISSED));
if (!isLoop && !isSpeaking) {
if (permissionCheck == PackageManager.PERMISSION_GRANTED) {
promptSpeechInput();
} else {
speak(new VoiceLine(R.raw.daga_kotowaru, Mood.PISSED));
}
}
}
@ -337,4 +339,4 @@ public class MainActivity extends AppCompatActivity {
}
}
}