fix: android

Author: ryanfurness

android/.project

@@ -1,22 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>android_</name>
+	<name>android</name>
 	<comment>Project android_ created by Buildship.</comment>
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1647995199383</id>
+			<id>0</id>
 			<name></name>
 			<type>30</type>
 			<matcher>

android/build.gradle

@@ -4,11 +4,11 @@ buildscript {
 
   repositories {
     google()
-    jcenter()
+    mavenCentral()
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.1.1'
+    classpath 'com.android.tools.build:gradle:4.2.2'
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
@@ -27,9 +27,8 @@ def getExtOrIntegerDefault(name) {
 
 android {
   compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
-  buildToolsVersion getExtOrDefault('buildToolsVersion')
   defaultConfig {
-    minSdkVersion 16
+    minSdkVersion 30
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
     versionCode 1
     versionName "1.0"
@@ -52,7 +51,6 @@ android {
 
 repositories {
   mavenCentral()
-  jcenter()
   google()
 
   def found = false

android/gradle.properties

@@ -1,4 +1,5 @@
-Transcribe_kotlinVersion=1.3.50
-Transcribe_compileSdkVersion=28
-Transcribe_buildToolsVersion=28.0.3
-Transcribe_targetSdkVersion=28
+Transcribe_kotlinVersion=1.4.10
+Transcribe_compileSdkVersion=30
+Transcribe_buildToolsVersion=30
+Transcribe_targetSdkVersion=30
+android.useAndroidX=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.reactnativetranscribe">
+          <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
 </manifest>

android/src/main/java/com/reactnativetranscribe/TranscribeModule.java

@@ -20,6 +20,9 @@
 import com.facebook.react.modules.core.PermissionListener;
 
 import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
 import javax.annotation.Nullable;
 
 public class TranscribeModule extends ReactContextBaseJavaModule {
@@ -32,6 +35,8 @@ public class TranscribeModule extends ReactContextBaseJavaModule {
   private AudioRecord audioRecord;
   private boolean isRecording;
 
+  private static final int PERMISSION_REQUEST_CODE = 1;
+
   int audioSource = MediaRecorder.AudioSource.MIC;
   int sampleRateInHz = 8000;
   int channelConfig = AudioFormat.CHANNEL_IN_MONO;
@@ -52,11 +57,21 @@ public String getName() {
   private void init(){
     Log.d(TAG,"init");
 
-    isRecording = false;
-    audioRecord = new AudioRecord(audioSource, sampleRateInHz, channelConfig, audioFormat, bufferSize * 10);
+    if (ContextCompat.checkSelfPermission(this.getCurrentActivity(),Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_DENIED) {
+      Log.d("permission", "permission denied to RECORD_AUDIO - requesting it");
+      String[] permissions = {Manifest.permission.RECORD_AUDIO};
+
+      ActivityCompat.requestPermissions(this.getCurrentActivity(), permissions, PERMISSION_REQUEST_CODE);
+
+    } else {
+      // RECORD_AUDIO has been granted
 
-    if (audioRecord.getState() != AudioRecord.STATE_INITIALIZED) {
-      Log.d(TAG, "Unable to initialize AudioRecord");
+      isRecording = false;
+      audioRecord = new AudioRecord(audioSource, sampleRateInHz, channelConfig, audioFormat, bufferSize * 10);
+
+      if (audioRecord.getState() != AudioRecord.STATE_INITIALIZED) {
+        Log.d(TAG, "Unable to initialize AudioRecord");
+      }
     }
   }
 

example/android/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>android</name>
+	<name>TranscribeExample</name>
 	<comment>Project android created by Buildship.</comment>
 	<projects>
 	</projects>
@@ -16,7 +16,7 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1647995199379</id>
+			<id>0</id>
 			<name></name>
 			<type>30</type>
 			<matcher>

example/android/app/build.gradle

@@ -76,7 +76,8 @@ import com.android.build.OutputFile
  */
 
 project.ext.react = [
-    enableHermes: false,  // clean and rebuild if changing
+  enableHermes: false,  // clean and rebuild if changing
+  entryFile: 'index.tsx'
 ]
 
 apply from: "../../node_modules/react-native/react.gradle"

example/android/app/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
   <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
   <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="false" android:theme="@style/AppTheme" android:usesCleartextTraffic="true">
-    <activity android:name=".MainActivity" android:label="@string/app_name" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize">
+    <activity android:name=".MainActivity" android:label="@string/app_name" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize" android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />

example/android/build.gradle

@@ -2,17 +2,16 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "28.0.3"
-        minSdkVersion = 16
-        compileSdkVersion = 28
-        targetSdkVersion = 28
+        minSdkVersion = 30
+        compileSdkVersion = 31
+        targetSdkVersion = 31
     }
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath('com.android.tools.build:gradle:4.1.1')
+        classpath('com.android.tools.build:gradle:4.2.2')
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files