Implementation of new permissions management pt. 2

Author: niedev

app/src/main/AndroidManifest.xml

@@ -101,7 +101,7 @@
             android:theme="@style/Theme.Speech"/>
 
         <service android:name="nie.translator.rtranslator.voice_translation._conversation_mode._conversation.ConversationService"
-            android:foregroundServiceType="microphone"/>
+            android:foregroundServiceType="dataSync|microphone"/>
         <service android:name="nie.translator.rtranslator.voice_translation._walkie_talkie_mode._walkie_talkie.WalkieTalkieService"
             android:foregroundServiceType="dataSync|microphone"/>
         <service android:name="nie.translator.rtranslator.GeneralService" />

app/src/main/java/nie/translator/rtranslator/GeneralActivity.java

@@ -19,14 +19,37 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Bundle;
+
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentActivity;
 
 import javax.annotation.Nullable;
 
+import nie.translator.rtranslator.access.AccessActivity;
+
 
 public abstract class GeneralActivity extends FragmentActivity {
 
+    @Override
+    protected void onCreate(@androidx.annotation.Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // if the models are not loaded and an activity different than LoadingActivity or AccessActivity is created,
+        // that means that the system has killed the app, and now it is launching the app with the last activity (restoring it).
+        // In this case we start the loading activity instead, otherwise the app will crash for the lack of loaded models.
+        // After the loading of the models, the app will handle itself the restore of the latest opened fragment (using the "fragment" key in sharedPreferences).
+        boolean isLoadingActivity = this instanceof LoadingActivity;
+        boolean isAccessActivity = this instanceof AccessActivity;
+        if(!isLoadingActivity && !isAccessActivity && !((Global) getApplication()).areModelsLoaded()){
+            //start LoadingActivity
+            Intent intent = new Intent(this, LoadingActivity.class);
+            intent.putExtra("activity", "general");
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+            finish();
+        }
+    }
+
     public void showMissingGoogleTTSDialog(@Nullable DialogInterface.OnClickListener continueListener) {
         final AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setMessage(R.string.error_missing_tts);

app/src/main/java/nie/translator/rtranslator/Global.java

@@ -72,7 +72,6 @@ public class Global extends Application implements DefaultLifecycleObserver {
             Manifest.permission.RECORD_AUDIO,
     };
 
-
     public enum RTranslatorMode {
         TEXT_TRANSLATION_MODE,
         WALKIE_TALKIE_MODE,
@@ -105,6 +104,7 @@ public enum RTranslatorMode {
     private boolean useTatoeba;
     private boolean useTranslationDictionaries;
     private VadSilero vad;
+    private boolean modelsLoaded = false;
 
     @Override
     public void onCreate() {
@@ -205,6 +205,14 @@ public void onDestroyed() {
         });
     }
 
+    public boolean areModelsLoaded() {
+        return modelsLoaded;
+    }
+
+    public void setModelsLoaded(boolean areModelsLoaded) {
+        this.modelsLoaded = areModelsLoaded;
+    }
+
     public void getLanguagesAndCheckTTS(final boolean recycleResult, boolean ignoreTTSError, final GetLocalesListListener responseListener) {
         if (recycleResult && !languages.isEmpty()) {
             responseListener.onSuccess(languages);

app/src/main/java/nie/translator/rtranslator/LoadingActivity.java

@@ -27,6 +27,7 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.Settings;
+import android.util.Log;
 
 import androidx.appcompat.app.AlertDialog;
 import java.util.ArrayList;
@@ -57,7 +58,7 @@ public LoadingActivity() {
     protected void onCreate(Bundle savedInstanceState) {
         String previousActivity = getIntent().getStringExtra("activity");
         SplashScreen splashScreen = null;
-        if(previousActivity == null || !previousActivity.equals("download")) {  //if this activity is called by the DownloadFragment we don't use the splash screen
+        if(previousActivity == null) {  //if this activity is called by another activity (instead of on launch), we don't use the splash screen
             // Handle the splash screen transition (it must remain before the super.onCreate() call).
             splashScreen = SplashScreen.installSplashScreen(this);
         }
@@ -104,6 +105,7 @@ protected void onPause() {
     }
 
     private void initializeApp(boolean ignoreTTSError) {
+        Log.i("app", "App initialization");
         global.getLanguagesAndCheckTTS(false, ignoreTTSError, new Global.GetLocalesListListener() {
             @Override
             public void onSuccess(ArrayList<CustomLocale> result) {
@@ -113,6 +115,7 @@ public void onSuccess() {
                         NeuralNetworkApi.InitListener speechRecognizerInitListener = new NeuralNetworkApi.InitListener() {
                             @Override
                             public void onInitializationFinished() {
+                                global.setModelsLoaded(true);
                                 if (isVisible) {
                                     startVoiceTranslationActivity();
                                 }

app/src/main/java/nie/translator/rtranslator/tools/ImageActivity.java

@@ -1,7 +1,5 @@
 package nie.translator.rtranslator.tools;
 
-//This activity is used only to create the images of the conversation mode in the readme
-
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
@@ -22,6 +20,8 @@
 import nie.translator.rtranslator.tools.gui.messages.GuiMessage;
 import nie.translator.rtranslator.tools.gui.messages.MessagesAdapter;
 
+//This activity is used only to create the images of the conversation mode in the readme
+
 public class ImageActivity extends Activity {
     protected MessagesAdapter mAdapter;
     protected RecyclerView mRecyclerView;

app/src/main/java/nie/translator/rtranslator/voice_translation/VoiceTranslationActivity.java

@@ -16,7 +16,6 @@
 
 package nie.translator.rtranslator.voice_translation;
 
-import android.Manifest;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -25,11 +24,9 @@
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.provider.Settings;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -50,6 +47,9 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import java.util.ArrayList;
 import java.util.List;
 import nie.translator.rtranslator.GeneralActivity;
@@ -86,7 +86,6 @@ public class VoiceTranslationActivity extends GeneralActivity {
     public static final int DEFAULT_FRAGMENT = TRANSLATION_FRAGMENT;
     //objects
     private Global global;
-    private Fragment fragment;
     private CoordinatorLayout fragmentContainer;
     private int currentFragment = -1;
     private boolean startingPairing = false;   //used to start Pairing Mode after bluetooth permissions are granted
@@ -139,7 +138,8 @@ protected void onStart() {
         super.onStart();
         // when we return to the app's gui based on the service that was saved in the last closure we choose which fragment to start
         SharedPreferences sharedPreferences = this.getSharedPreferences("default", Context.MODE_PRIVATE);
-        setFragment(sharedPreferences.getInt("fragment", DEFAULT_FRAGMENT));
+        int fragment = sharedPreferences.getInt("fragment", DEFAULT_FRAGMENT);
+        setFragment(fragment, fragment == WALKIE_TALKIE_FRAGMENT || fragment == PAIRING_FRAGMENT);
         if(getResources() != null) {
             config = getResources().getConfiguration();
         }
@@ -165,14 +165,18 @@ public boolean onCreateOptionsMenu(Menu menu) {
     }
 
     public void setFragment(int fragmentName) {
+        setFragment(fragmentName, false);
+    }
+
+    public void setFragment(int fragmentName, boolean requestPermission) {
         switch (fragmentName) {
             case PAIRING_FRAGMENT: {
                 // possible stop of the Conversation and WalkieTalkie Service
                 stopConversationService();
                 stopWalkieTalkieService();
                 // possible setting of the fragment
-                if (getCurrentFragment() != PAIRING_FRAGMENT) {
-                    if (Tools.hasPermissions(this, Global.REQUIRED_PERMISSIONS_PAIRING)) {
+                if (getCurrentFragmentId() != PAIRING_FRAGMENT) {
+                    if (Tools.hasPermissions(this, Global.REQUIRED_PERMISSIONS_PAIRING) || !requestPermission) {
                         global.initializeBluetoothCommunicator();
                         if(global.getBluetoothCommunicator() != null && global.getBluetoothCommunicator().isBluetoothLeSupported()){
                             PairingFragment paringFragment = new PairingFragment();
@@ -198,7 +202,7 @@ public void setFragment(int fragmentName) {
             }
             case CONVERSATION_FRAGMENT: {
                 // possible setting of the fragment
-                if (getCurrentFragment() != CONVERSATION_FRAGMENT && global.getBluetoothCommunicator() != null) {
+                if (getCurrentFragmentId() != CONVERSATION_FRAGMENT && global.getBluetoothCommunicator() != null) {
                     ConversationFragment conversationFragment = new ConversationFragment();
                     Bundle bundle = new Bundle();
                     bundle.putBoolean("firstStart", true);
@@ -210,7 +214,7 @@ public void setFragment(int fragmentName) {
                     currentFragment = CONVERSATION_FRAGMENT;
                     saveFragment();
                     // eventual permission request
-                    if (Tools.hasPermissions(this, Global.REQUIRED_PERMISSIONS_VOICE)) {
+                    if (!Tools.hasPermissions(this, Global.REQUIRED_PERMISSIONS_VOICE) && requestPermission) {
                         showPermissionDialog(CONVERSATION_FRAGMENT);
                     }
                     //fragment= conversationFragment;
@@ -221,8 +225,8 @@ public void setFragment(int fragmentName) {
             }
             case WALKIE_TALKIE_FRAGMENT: {
                 // possible setting of the fragment
-                if (getCurrentFragment() != WALKIE_TALKIE_FRAGMENT) {
-                    if (Tools.hasPermissions(this, Global.REQUIRED_PERMISSIONS_VOICE)) {
+                if (getCurrentFragmentId() != WALKIE_TALKIE_FRAGMENT) {
+                    if (Tools.hasPermissions(this, Global.REQUIRED_PERMISSIONS_VOICE) || !requestPermission) {
                         WalkieTalkieFragment walkieTalkieFragment = new WalkieTalkieFragment();
                         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
                         Bundle bundle = new Bundle();
@@ -245,7 +249,7 @@ public void setFragment(int fragmentName) {
                 stopConversationService();
                 stopWalkieTalkieService();
                 // possible setting of the fragment
-                if (getCurrentFragment() != TRANSLATION_FRAGMENT) {
+                if (getCurrentFragmentId() != TRANSLATION_FRAGMENT) {
                     TranslationFragment translationFragment = new TranslationFragment();
                     FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
                     Bundle bundle = new Bundle();
@@ -270,13 +274,13 @@ public void run() {
                 //save fragment
                 SharedPreferences sharedPreferences = VoiceTranslationActivity.this.getSharedPreferences("default", Context.MODE_PRIVATE);
                 SharedPreferences.Editor editor = sharedPreferences.edit();
-                editor.putInt("fragment", getCurrentFragment());
+                editor.putInt("fragment", getCurrentFragmentId());
                 editor.apply();
             }
         }.start();
     }
 
-    public int getCurrentFragment() {
+    public int getCurrentFragmentId() {
         if (currentFragment != -1) {
             return currentFragment;
         } else {
@@ -299,6 +303,10 @@ public int getCurrentFragment() {
         return -1;
     }
 
+    public Fragment getCurrentFragment() {
+        return getSupportFragmentManager().findFragmentById(R.id.fragment_container);
+    }
+
     @Override
     public void onConfigurationChanged(@NonNull Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
@@ -382,22 +390,23 @@ public void disconnect(Peer peer) {
     }
 
 
-    private void showPermissionDialog(int mode){
+    public void showPermissionDialog(int mode){
         final View editDialogLayout = this.getLayoutInflater().inflate(R.layout.dialog_permission, null);
 
-        final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this, R.style.MyThemeOverlay_MaterialComponents_MaterialAlertDialog);
         builder.setCancelable(true);
-        //builder.setTitle("");
 
         AlertDialog dialog = builder.create();
-        if (dialog.getWindow() != null) {
-            // Requests the window to have no title
-            dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
-            // Removes the default system background and padding
-            dialog.getWindow().setBackgroundDrawable(new android.graphics.drawable.ColorDrawable(android.graphics.Color.TRANSPARENT));
-        }
         dialog.setView(editDialogLayout, 0, Tools.convertDpToPixels(this, 16), 0, 0);
         dialog.show();
+        dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface dialog) {
+                if(currentFragment == -1){
+                    setFragment(DEFAULT_FRAGMENT);
+                }
+            }
+        });
 
         ImageView icon = editDialogLayout.findViewById(R.id.dialogIcon);
         TextView text = editDialogLayout.findViewById(R.id.textView);
@@ -466,12 +475,17 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
             return;
         }
 
+        Fragment fragment = getCurrentFragment();
+
         if(requestCode == Global.REQUEST_CODE_PERMISSIONS_PAIRING){
             for (int grantResult : grantResults) {
                 if (grantResult == PackageManager.PERMISSION_DENIED) {
                     //notifyMissingSearchPermission();
                     Toast.makeText(global, R.string.error_missing_location_permissions, Toast.LENGTH_LONG).show();
                     startingPairing = false;
+                    if(currentFragment == -1){
+                        setFragment(DEFAULT_FRAGMENT);
+                    }
                     return;
                 }
             }
@@ -486,10 +500,16 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
         if(requestCode == Global.REQUEST_CODE_PERMISSIONS_WALKIETALKIE){
             for (int grantResult : grantResults) {
                 if (grantResult == PackageManager.PERMISSION_DENIED) {
+                    if(fragment instanceof VoiceTranslationFragment) ((VoiceTranslationFragment) fragment).onMicPermissionResult(false);
                     //todo: convert the string to resource and translate it
                     Toast.makeText(global, "It is not possible to use the WalkieTalkie mode without microphone permission, go to the settings to grant it, or reinstall the app", Toast.LENGTH_LONG).show();
                     startingWalkieTalkie = false;
+                    if(currentFragment == -1){
+                        setFragment(DEFAULT_FRAGMENT);
+                    }
                     return;
+                }else{
+                    if(fragment instanceof VoiceTranslationFragment) ((VoiceTranslationFragment) fragment).onMicPermissionResult(true);
                 }
             }
             //mic permission is granted
@@ -500,11 +520,21 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
         }
 
         if(requestCode == Global.REQUEST_CODE_PERMISSIONS_CONVERSATION){
+            ConversationMainFragment conversationFragment = null;
+            if(fragment instanceof ConversationFragment){
+                Fragment f = ((ConversationFragment) fragment).getCurrentFragment();
+                if(f instanceof ConversationMainFragment){
+                    conversationFragment = (ConversationMainFragment) f;
+                }
+            }
             for (int grantResult : grantResults) {
                 if (grantResult == PackageManager.PERMISSION_DENIED) {
+                    if(conversationFragment != null) conversationFragment.onMicPermissionResult(false);
                     //todo: convert the string to resource and translate it
                     Toast.makeText(global, R.string.error_missing_mic_permissions, Toast.LENGTH_LONG).show();
                     return;
+                }else{
+                    if(conversationFragment != null) conversationFragment.onMicPermissionResult(true);
                 }
             }
             //mic permission is granted
@@ -574,7 +604,6 @@ public void startConversationService(Notification notification, final Global.Res
         }
         startService(intent);
         if(responseListener != null) responseListener.onSuccess();
-
     }
 
     public void startWalkieTalkieService(Notification notification, final Global.ResponseListener responseListener) {