Fixing profile language

Author: DPigeon

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

@@ -288,7 +288,7 @@ else if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL)
                 view.getContext().getDrawable(R.drawable.user_profile).clearColorFilter();
                 view.invalidate();
                 // Go to the profile activity with a nice slide animation
-                goToActivity(ProfileActivity.class);
+                goToProfileActivity(ProfileActivity.class, "no");
             }
 
             return true;
@@ -653,7 +653,7 @@ protected void loadProfile() {
             if (outputLang != -1)
                 setOutputLanguage(outputLang);
         } else {
-            goToActivity(ProfileActivity.class);
+            goToProfileActivity(ProfileActivity.class, "yes");
             Toast.makeText(getApplicationContext(), "Create your profile!", Toast.LENGTH_LONG).show();
         }
     }
@@ -682,10 +682,11 @@ public static int getScreenHeight() {
         return Resources.getSystem().getDisplayMetrics().heightPixels;
     }
 
-    void goToActivity(Class activity) { // Function that goes from the main activity to another one
+    void goToProfileActivity(Class activity, String firstTime) { // Function that goes from the main activity to profile one
         Intent intent = new Intent(MainActivity.this, activity);
         intent.putExtra("lensFacing", lensFacing);
         intent.putExtra("mode", currentMode.ordinal());
+        intent.putExtra("firstTime", firstTime);
         startActivity(intent);
     }
 

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

@@ -59,7 +59,7 @@ public boolean onCreateOptionsMenu(Menu menu) { // Creates the three dot action
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int menuId = item.getItemId();
-        if(menuId == R.id.profile_settings) { // If we click on the ... button
+        if (menuId == R.id.profile_settings) { // If we click on the ... button
             switchMode(true, View.VISIBLE); // Switch to edit mode
         }
         return super.onOptionsItemSelected(item);
@@ -99,7 +99,9 @@ protected void addRadioButtons(String languages, int i) {
     }
 
     protected void setActivityFields() {
-        if (sharedPreferenceHelper.getProfile().getLanguage() == -1) { // Info does not exist
+        Intent intent = getIntent();
+        String firstTime = intent.getStringExtra("firstTime");
+        if (firstTime.equals("yes")) { // If first time launching app
             switchMode(true, View.VISIBLE); // Switch to the edit mode
         }
         else {
@@ -134,7 +136,7 @@ protected void saveProfile() {
             toastMessage("Your profile has been saved!");
             goToActivity(MainActivity.class);
         } else
-            toastMessage("An error occured while saving your profile!");
+            toastMessage("You must choose a language!");
     }
 
     protected void toastMessage(String message) { // Shows a toast message