From ec626cd9fe052d035be04354da94e7377ea55bdf Mon Sep 17 00:00:00 2001
From: Catfriend1 <ref_github@reiseredv.de>
Date: Sat, 26 May 2018 17:44:45 +0200
Subject: [PATCH] Fix loading text (#1101)

---
 .../syncthingandroid/activities/FirstStartActivity.java     | 2 +-
 .../nutomic/syncthingandroid/activities/MainActivity.java   | 1 +
 .../syncthingandroid/activities/StateDialogActivity.java    | 6 +++---
 .../syncthingandroid/activities/SyncthingActivity.java      | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java
index 448b264b..177ecf5c 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java
@@ -62,7 +62,7 @@ public class FirstStartActivity extends Activity implements Button.OnClickListen
         // In case start_into_web_gui option is enabled, start both activities so that back
         // navigation works as expected.
         Intent mainIntent = new Intent(this, MainActivity.class);
-        mainIntent.putExtra(MainActivity.EXTRA_FIRST_START, isFirstStart);
+        mainIntent.putExtra(MainActivity.EXTRA_KEY_GENERATION_IN_PROGRESS, isFirstStart);
         Intent webIntent = new Intent(this, WebGuiActivity.class);
         if (mPreferences.getBoolean("start_into_web_gui", false)) {
             startActivities(new Intent[] {mainIntent, webIntent});
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
index 71cd8ee4..a6c06502 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
@@ -105,6 +105,7 @@ public class MainActivity extends StateDialogActivity
             case STARTING:
                 break;
             case ACTIVE:
+                getIntent().putExtra(this.EXTRA_KEY_GENERATION_IN_PROGRESS, false);
                 showBatteryOptimizationDialogIfNecessary();
                 mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
                 mDrawerFragment.requestGuiUpdate();
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/StateDialogActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/StateDialogActivity.java
index 9e247345..f90ab337 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/StateDialogActivity.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/StateDialogActivity.java
@@ -111,8 +111,8 @@ public abstract class StateDialogActivity extends SyncthingActivity {
 
         DialogLoadingBinding binding = DataBindingUtil.inflate(
                 getLayoutInflater(), R.layout.dialog_loading, null, false);
-        boolean isFirstStart = getIntent().getBooleanExtra(EXTRA_FIRST_START, false);
-        binding.loadingText.setText((isFirstStart)
+        boolean isGeneratingKeys = getIntent().getBooleanExtra(EXTRA_KEY_GENERATION_IN_PROGRESS, false);
+        binding.loadingText.setText((isGeneratingKeys)
                 ? R.string.web_gui_creating_key
                 : R.string.api_loading);
 
@@ -121,7 +121,7 @@ public abstract class StateDialogActivity extends SyncthingActivity {
                 .setView(binding.getRoot())
                 .show();
 
-        if (!isFirstStart) {
+        if (!isGeneratingKeys) {
             new Handler().postDelayed(() -> {
                 if (isFinishing() || mLoadingDialog == null)
                     return;
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java
index 6df1350d..847abd4c 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java
@@ -22,7 +22,7 @@ import java.util.LinkedList;
  */
 public abstract class SyncthingActivity extends AppCompatActivity implements ServiceConnection {
 
-    public static final String EXTRA_FIRST_START = "com.nutomic.syncthing-android.SyncthingActivity.FIRST_START";
+    public static final String EXTRA_KEY_GENERATION_IN_PROGRESS = "com.nutomic.syncthing-android.SyncthingActivity.KEY_GENERATION_IN_PROGRESS";
 
     private SyncthingService mSyncthingService;