All calls by serverClient are now working.

src/main/java/org/amahi/anywhere/AmahiModule.java

@@ -32,6 +32,7 @@
 import org.amahi.anywhere.activity.ServerFileWebActivity;
 import org.amahi.anywhere.activity.ServerFilesActivity;
 import org.amahi.anywhere.fragment.NavigationFragment;
+import org.amahi.anywhere.fragment.NonAdminNavigationFragment;
 import org.amahi.anywhere.fragment.ServerAppsFragment;
 import org.amahi.anywhere.fragment.ServerFileDownloadingFragment;
 import org.amahi.anywhere.fragment.ServerFileImageFragment;
@@ -87,7 +88,8 @@
                 TvPlaybackVideoFragment.class,
                 TvPlaybackVideoActivity.class,
                 TvPlaybackAudioActivity.class,
-                TvPlaybackAudioFragment.class
+                TvPlaybackAudioFragment.class,
+                NonAdminNavigationFragment.class
         }
 )
 class AmahiModule {

src/main/java/org/amahi/anywhere/activity/NavigationActivity.java

@@ -43,6 +43,7 @@
 import org.amahi.anywhere.bus.SettingsSelectedEvent;
 import org.amahi.anywhere.bus.ShareSelectedEvent;
 import org.amahi.anywhere.bus.SharesSelectedEvent;
+import org.amahi.anywhere.fragment.NonAdminNavigationFragment;
 import org.amahi.anywhere.server.client.ServerClient;
 import org.amahi.anywhere.server.model.ServerApp;
 import org.amahi.anywhere.server.model.ServerShare;
@@ -266,7 +267,8 @@ public void onSharesSelected(SharesSelectedEvent event) {
             setUpTitle();
         }
 
-        setUpShares();
+        //setUpShares();
+        Fragments.Operator.at(this).replace(new NonAdminNavigationFragment(), R.id.container_content);
 
         if (isNavigationDrawerAvailable()) {
             hideNavigationDrawer();

src/main/java/org/amahi/anywhere/fragment/NavigationFragment.java

@@ -35,6 +35,7 @@
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -76,6 +77,8 @@
 
 import javax.inject.Inject;
 
+import static android.content.Context.MODE_PRIVATE;
+
 /**
  * Navigation fragments. Shows main application sections and servers list as well.
  */
@@ -423,6 +426,13 @@ public void onServerConnected(ServerConnectedEvent event) {
 		setUpServerConnection();
 		setUpServerNavigation();
 		if (CheckTV.isATV(getContext())) launchTV();
+		//Note: @octacode - Done temporarily for debugging purposes.
+//		Log.d(getClass().getSimpleName()+" Address: ",serverClient.getServerAddress());
+//		Log.d(getClass().getSimpleName()+" Server name: ",serverClient.getServerName());
+//		Log.d(getClass().getSimpleName()+" Session token: ",serverClient.getSessionToken());
+//		getContext().getSharedPreferences(getContext().getString(R.string.preference), MODE_PRIVATE).edit().putString("session_token", "5d08161f61f50f2fdb6802c74d0b2c75dba3cace").apply();
+//		getContext().getSharedPreferences(getContext().getString(R.string.preference), MODE_PRIVATE).edit().putString("server_name", "octacode-3").apply();
+//		getContext().getSharedPreferences(getContext().getString(R.string.preference), MODE_PRIVATE).edit().putString("server_address", "http://192.168.225.68:4563").apply();
 	}
 
 	private void setUpServerConnection() {

src/main/java/org/amahi/anywhere/fragment/NonAdminNavigationFragment.java

@@ -0,0 +1,106 @@
+package org.amahi.anywhere.fragment;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Spinner;
+import android.widget.Toast;
+
+import com.squareup.otto.Subscribe;
+
+import org.amahi.anywhere.AmahiApplication;
+import org.amahi.anywhere.R;
+import org.amahi.anywhere.activity.AuthenticationActivity;
+import org.amahi.anywhere.activity.IntroductionActivity;
+import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.NonAdminPublicKeySucceedEvent;
+import org.amahi.anywhere.bus.ServerConnectedEvent;
+import org.amahi.anywhere.bus.ServerSharesLoadedEvent;
+import org.amahi.anywhere.server.client.ServerClient;
+import org.amahi.anywhere.server.model.NonAdminPublicKey;
+import org.amahi.anywhere.server.model.Server;
+import org.amahi.anywhere.util.CheckTV;
+import org.amahi.anywhere.util.Preferences;
+
+import javax.inject.Inject;
+
+import static android.content.Context.MODE_PRIVATE;
+
+public class NonAdminNavigationFragment extends Fragment{
+
+    @Inject
+    ServerClient serverClient;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setUpInjections();
+        String sessionToken = getContext().getSharedPreferences(getString(R.string.preference), MODE_PRIVATE).getString("session_token", "");
+        String serverName = getContext().getSharedPreferences(getString(R.string.preference), MODE_PRIVATE).getString("server_name", "");
+        String serverAddress = getContext().getSharedPreferences(getString(R.string.preference), MODE_PRIVATE).getString("server_address", "");
+
+        if(sessionToken.isEmpty() || serverName.isEmpty() || serverAddress.isEmpty()) {
+            startActivity(new Intent(getContext(), AuthenticationActivity.class));
+        }
+
+        Server server = new Server(serverName, sessionToken, serverAddress, true);
+        serverClient.connecttoNonadmin(server);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View rootView = inflater.inflate(R.layout.fragment_navigation, container, false);
+        Spinner spinner = (Spinner)rootView.findViewById(R.id.spinner_servers);
+        spinner.setVisibility(View.GONE);
+        return rootView;
+    }
+
+    @Override
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        launchIntro();
+    }
+
+    private void launchIntro(){
+        if(Preferences.getFirstRun(getContext()) && !CheckTV.isATV(getContext())){
+            Preferences.setFirstRun(getContext());
+            startActivity(new Intent(getContext(), IntroductionActivity.class));
+        }
+    }
+
+    private void setUpInjections() {
+        AmahiApplication.from(getActivity()).inject(this);
+    }
+
+
+    @Subscribe
+    public void onServerConnected(ServerConnectedEvent event) {
+        Toast.makeText(getContext(), event.getServer().getName(), Toast.LENGTH_SHORT).show();
+        serverClient.getShares();
+    }
+
+    @Subscribe
+    public void onSharesLoaded(ServerSharesLoadedEvent event) {
+        Toast.makeText(getContext(), event.getServerShares().get(0).getName(), Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        BusProvider.getBus().register(this);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        BusProvider.getBus().unregister(this);
+    }
+}

src/main/java/org/amahi/anywhere/server/client/ServerClient.java

@@ -157,6 +157,8 @@ public void connect(Server server) {
 	public void connecttoNonadmin(Server server) {
 		this.server = server;
 		serverAddress = server.getServerAddress();
+
+        finishServerConnection();
 	}
 
 	private void startServerConnection() {
@@ -204,6 +206,14 @@ public String getServerAddress() {
 		return serverAddress;
 	}
 
+	public String getServerName() {
+		return server.getName();
+	}
+
+	public String getSessionToken() {
+		return server.getSession();
+	}
+
 	public void getShares() {
 		serverApi.getShares(server.getSession()).enqueue(new ServerSharesResponse());
 	}