From b3590fed358afed180f48d7faceb9677a0836952 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Mon, 28 Mar 2016 23:56:20 +0200
Subject: [PATCH] For simplicity hide some internal states from the user

Display connecting->connected instead of connecting->connected->initializing->initialized
---
 .../freeyourgadget/gadgetbridge/impl/GBDevice.java    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java
index 763e6375..1e46d978 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java
@@ -53,7 +53,6 @@ public class GBDevice implements Parcelable {
     private BatteryState mBatteryState;
     private short mRssi = RSSI_UNKNOWN;
     private String mBusyTask;
-    private String infoString;
     private List<ItemWithDetails> mDeviceInfos;
 
     public GBDevice(String address, String name, DeviceType deviceType) {
@@ -204,23 +203,25 @@ public class GBDevice implements Parcelable {
     }
 
     public String getStateString() {
+         /*
+          * for simplicity the user wont see all internal states, just connecting -> connected
+          * instead of connecting->connected->initializing->initialized
+          */
         switch (mState) {
             case NOT_CONNECTED:
                 return GBApplication.getContext().getString(R.string.not_connected);
             case WAITING_FOR_RECONNECT:
                 return GBApplication.getContext().getString(R.string.waiting_for_reconnect);
             case CONNECTING:
-                return GBApplication.getContext().getString(R.string.connecting);
             case CONNECTED:
-                return GBApplication.getContext().getString(R.string.connected);
             case INITIALIZING:
-                return GBApplication.getContext().getString(R.string.initializing);
+                return GBApplication.getContext().getString(R.string.connecting);
             case AUTHENTICATION_REQUIRED:
                 return GBApplication.getContext().getString(R.string.authentication_required);
             case AUTHENTICATING:
                 return GBApplication.getContext().getString(R.string.authenticating);
             case INITIALIZED:
-                return GBApplication.getContext().getString(R.string.initialized);
+                return GBApplication.getContext().getString(R.string.connected);
         }
         return GBApplication.getContext().getString(R.string.unknown_state);
     }