Fixing the progress overlay crash & infinite profile loop bug

Author: DPigeon

app/build.gradle

@@ -10,7 +10,7 @@ android {
         minSdkVersion 22
         targetSdkVersion 29
         versionCode 1
-        versionName "2.1-alpha"
+        versionName "2.2.1-alpha"
         // To improve image processing performance
         renderscriptTargetApi 21
         renderscriptSupportModeEnabled true

app/src/main/java/com/ctext/MainActivity.java

@@ -79,7 +79,6 @@ public class MainActivity extends AppCompatActivity implements RecognitionListen
     private boolean faceProcessing = false; // For throttling the calls
     private long animationDuration = 1000; // milliseconds
     private boolean faceDetected = false; // For face check imageView anim to run once
-    private boolean outOfMainActivity = false; // Flag to stop speech recognition on other activities
     private FrameLayout progressOverlay; // Loading overlay wheel
 
     /* Video Variables */
@@ -189,9 +188,9 @@ public void goToObjectDefinition(String word) {
                     intent.putExtra("word", word);
                     intent.putExtra("inputLanguage", getInputLanguage());
                     intent.putExtra("outputLanguage", getOutputLanguage());
-                    outOfMainActivity = true;
                     startActivity(intent);
                 } else {
+                    // Infinity Loop here BUG
                     goToProfileActivity("yes");
                     Toast.makeText(getApplicationContext(), "Set your language!", Toast.LENGTH_LONG).show();
                 }
@@ -239,8 +238,7 @@ public void onError(int error) {
             Log.d(TAG, "Unknown error");
         }
 
-        if (!outOfMainActivity)
-            persistentSpeech();
+        persistentSpeech();
     }
 
     @Override
@@ -572,8 +570,7 @@ protected void startRecognition() {
             mAudioManager.setStreamMute(AudioManager.STREAM_MUSIC, true); // Mutes any sound of beep for listening
             mRecognizer.startListening(intent);
         } else { // If language not set then send back to profile activity
-            goToProfileActivity("yes");
-            Toast.makeText(getApplicationContext(), "Set your language!", Toast.LENGTH_LONG).show();
+            Toast.makeText(getApplicationContext(), "Your language is not set!", Toast.LENGTH_LONG).show();
         }
     }
 
@@ -695,12 +692,12 @@ protected int getOutputLanguage() {
     }
 
     void goToProfileActivity(String firstTime) { // Function that goes from the main activity to profile one
-        progressOverlay.setVisibility(View.VISIBLE);
+        if (progressOverlay != null)
+            progressOverlay.setVisibility(View.VISIBLE);
         Intent intent = new Intent(MainActivity.this, ProfileActivity.class);
         intent.putExtra("lensFacing", lensFacing);
         intent.putExtra("mode", currentMode.ordinal());
         intent.putExtra("firstTime", firstTime);
-        outOfMainActivity = true;
         stopListeningSpeech();
         startActivity(intent);
     }