Fixed add first location loop; added add location button

app/src/main/java/com/rthoni/camotion/ui/AddAccountActivity.java

@@ -145,6 +145,7 @@ public class AddAccountActivity extends AppCompatActivity {
             if (_response != null) {
                 _response.onResult(result);
             }
+            setResult(RESULT_OK);
             finish();
         }
     }

app/src/main/java/com/rthoni/camotion/ui/MainActivity.java

@@ -82,9 +82,7 @@ public class MainActivity extends AppCompatActivity
 
         if (locations.isEmpty())
         {
-            Intent intent = new Intent(Settings.ACTION_ADD_ACCOUNT);
-            intent.putExtra(Settings.EXTRA_AUTHORITIES, new String[]{getResources().getString(R.string.account_type)});
-            startActivityForResult(intent, REQUEST_CODE_ADD_ACCOUNT);
+            startActivityForResult(new Intent(this, AddAccountActivity.class), REQUEST_CODE_ADD_ACCOUNT);
             return;
         }
 
@@ -135,7 +133,15 @@ public class MainActivity extends AppCompatActivity
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == REQUEST_CODE_ADD_ACCOUNT)
         {
-            init();
+            if (resultCode == RESULT_OK) {
+                init();
+            }
+            else {
+                List<LocationDbo> locations = CamotionBusiness.getLocations(MainActivity.this);
+                if (locations.size() == 0) {
+                    finish();
+                }
+            }
         }
     }
 
@@ -227,6 +233,9 @@ public class MainActivity extends AppCompatActivity
         if (id == R.id.nav_cameras || id == R.id.nav_sensors || id == R.id.nav_commands) {
             showView(id);
         }
+        else if (id == R.id.nav_add_account) {
+            startActivityForResult(new Intent(this, AddAccountActivity.class), REQUEST_CODE_ADD_ACCOUNT);
+        }
 
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
         drawer.closeDrawer(GravityCompat.START);

app/src/main/res/menu/activity_main_drawer.xml

@@ -20,10 +20,14 @@
         android:id="@+id/location_menu">
         <menu>
             <item
-                android:id="@+id/nav_share"
                 android:icon="@mipmap/ic_location"
                 android:title="@string/location_select" />
         </menu>
     </item>
 
+    <item
+        android:id="@+id/nav_add_account"
+        android:icon="@mipmap/ic_plus"
+        android:title="@string/location_add" />
+
 </menu>

app/src/main/res/values/strings.xml

@@ -13,6 +13,7 @@
     <string name="action_settings">Settings</string>
     <string name="locations">Locations</string>
     <string name="location_select">Select Location</string>
+    <string name="location_add">Add Location</string>
 
     <string name="add_location">Add a location</string>
     <string name="add_location_text">Fill in the following fields to add a location:</string>