Android - People - Visit Online connections working

android/app/src/main/cpp/native.cpp

@@ -209,6 +209,11 @@ JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeGotoUr
     DependencyManager::get<AddressManager>()->loadSettings(jniUrl.toString());
 }
 
+JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeGoToUser(JNIEnv* env, jobject obj, jstring username) {
+    QAndroidJniObject jniUsername("java/lang/String", "(Ljava/lang/String;)V", username);
+    DependencyManager::get<AddressManager>()->goToUser(jniUsername.toString(), false);
+}
+
 JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeOnPause(JNIEnv* env, jobject obj) {
 }
 

android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java

@@ -48,6 +48,7 @@ import com.google.vr.ndk.base.GvrApi;*/
 public class InterfaceActivity extends QtActivity implements WebViewFragment.OnWebViewInteractionListener {
 
     public static final String DOMAIN_URL = "url";
+    public static final String EXTRA_GOTO_USERNAME = "gotousername";
     private static final String TAG = "Interface";
     private static final int WEB_DRAWER_RIGHT_MARGIN = 262;
     private static final int WEB_DRAWER_BOTTOM_MARGIN = 150;
@@ -59,6 +60,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
     private native long nativeOnCreate(InterfaceActivity instance, AssetManager assetManager);
     private native void nativeOnDestroy();
     private native void nativeGotoUrl(String url);
+    private native void nativeGoToUser(String username);
     private native void nativeBeforeEnterBackground();
     private native void nativeEnterBackground();
     private native void nativeEnterForeground();
@@ -280,6 +282,9 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
         if (intent.hasExtra(DOMAIN_URL)) {
             webSlidingDrawer.setVisibility(View.GONE);
             nativeGotoUrl(intent.getStringExtra(DOMAIN_URL));
+        } else if (intent.hasExtra(EXTRA_GOTO_USERNAME)) {
+            webSlidingDrawer.setVisibility(View.GONE);
+            nativeGoToUser(intent.getStringExtra(EXTRA_GOTO_USERNAME));
         }
     }
 

android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java

@@ -37,7 +37,8 @@ import io.highfidelity.hifiinterface.task.DownloadProfileImageTask;
 
 public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener,
                                                                 LoginFragment.OnLoginInteractionListener,
-                                                                HomeFragment.OnHomeInteractionListener {
+                                                                HomeFragment.OnHomeInteractionListener,
+                                                                FriendsFragment.OnHomeInteractionListener {
 
     private static final int PROFILE_PICTURE_PLACEHOLDER = R.drawable.default_profile_avatar;
     public static final String DEFAULT_FRAGMENT = "Home";
@@ -251,6 +252,14 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         startActivity(intent);
     }
 
+    private void goToUser(String username) {
+        Intent intent = new Intent(this, InterfaceActivity.class);
+        intent.putExtra(InterfaceActivity.EXTRA_GOTO_USERNAME, username);
+        finish();
+        intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        startActivity(intent);
+    }
+
     @Override
     public void onLoginCompleted() {
         loadHomeFragment();
@@ -280,6 +289,11 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         loadPrivacyPolicyFragment();
     }
 
+    @Override
+    public void onVisitUserSelected(String username) {
+        goToUser(username);
+    }
+
     private class RoundProfilePictureCallback implements Callback {
         @Override
         public void onSuccess() {

android/app/src/main/java/io/highfidelity/hifiinterface/fragment/FriendsFragment.java

@@ -2,6 +2,7 @@ package io.highfidelity.hifiinterface.fragment;
 
 
 import android.app.Fragment;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
@@ -32,6 +33,8 @@ public class FriendsFragment extends Fragment {
     private EndpointUsersProvider mUsersProvider;
     private String mSelectedUsername;
 
+    private OnHomeInteractionListener mListener;
+
     public FriendsFragment() {
         // Required empty public constructor
     }
@@ -65,6 +68,15 @@ public class FriendsFragment extends Fragment {
 
         rootView.findViewById(R.id.userActionDelete).setOnClickListener(view -> onRemoveConnectionClick());
 
+        rootView.findViewById(R.id.userActionVisit).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (mListener != null && mSelectedUsername != null) {
+                    mListener.onVisitUserSelected(mSelectedUsername);
+                }
+            }
+        });
+
         mUsersAdapter.setClickListener(new UserListAdapter.ItemClickListener() {
             @Override
             public void onItemClick(View view, int position, UserListAdapter.User user) {
@@ -135,4 +147,19 @@ public class FriendsFragment extends Fragment {
             return false;
         }
     }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof OnHomeInteractionListener) {
+            mListener = (OnHomeInteractionListener) context;
+        } else {
+            throw new RuntimeException(context.toString()
+                    + " must implement OnHomeInteractionListener");
+        }
+    }
+
+    public interface OnHomeInteractionListener {
+        void onVisitUserSelected(String username);
+    }
 }

android/app/src/main/java/io/highfidelity/hifiinterface/provider/EndpointUsersProvider.java

@@ -85,6 +85,10 @@ public class EndpointUsersProvider implements UsersProvider {
                     adapterUser.imageUrl = user.images.thumbnail;
                     adapterUser.name = user.username;
                     adapterUser.online = user.online;
+                    adapterUser.locationName = (user.location != null ?
+                            (user.location.root != null ? user.location.root.name :
+                                    (user.location.domain != null ? user.location.domain.name : ""))
+                            : "");
                     adapterUsers.add(adapterUser);
                 }
                 usersCallback.retrieveOk(adapterUsers);
@@ -199,6 +203,7 @@ public class EndpointUsersProvider implements UsersProvider {
         boolean online;
         String connection;
         Images images;
+        LocationData location;
     }
 
     class Images {
@@ -208,4 +213,13 @@ public class EndpointUsersProvider implements UsersProvider {
         String tiny;
     }
 
+    class LocationData {
+        public LocationData() {}
+        NameContainer root;
+        NameContainer domain;
+    }
+    class NameContainer {
+        String name;
+    }
+
 }

android/app/src/main/java/io/highfidelity/hifiinterface/view/UserListAdapter.java

@@ -70,10 +70,12 @@ public class UserListAdapter extends RecyclerView.Adapter<UserListAdapter.ViewHo
     public void onBindViewHolder(UserListAdapter.ViewHolder holder, int position) {
         User aUser = mUsers.get(position);
         holder.mUsername.setText(aUser.name);
+
         holder.mOnlineInfo.setVisibility(aUser.online? View.VISIBLE : View.GONE);
+        holder.mLocation.setText("- " + aUser.locationName); // Bring info from the API and use it here
+
         holder.mFriendStar.onBindSet(aUser.name, aUser.connection.equals(UsersProvider.CONNECTION_TYPE_FRIEND));
         Uri uri = Uri.parse(aUser.imageUrl);
-        holder.mLocation.setText(" - unknown"); // Bring info from the API and use it here
         Picasso.get().load(uri).into(holder.mImage, new RoundProfilePictureCallback(holder.mImage));
     }
 
@@ -213,6 +215,8 @@ public class UserListAdapter extends RecyclerView.Adapter<UserListAdapter.ViewHo
         public String connection;
         public boolean online;
 
+        public String locationName;
+
         public User() {}
     }
 }

android/app/src/main/res/layout/user_item.xml

@@ -42,6 +42,7 @@
                 android:id="@+id/userLocation"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="3dp"
                 android:fontFamily="@font/raleway_italic"
                 android:textColor="@color/menuOption"/>
         </LinearLayout>