Support for base64 in recycler

kute-android-app/app/src/main/AndroidManifest.xml

@@ -2,15 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.scorelab.kute.kute">
 
-<<<<<<< HEAD
+
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
-=======
-    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
->>>>>>> ProfilePictureUpdate
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-feature
@@ -38,11 +33,11 @@
             android:value="@string/googlemapApi"/>
 
         <activity android:name=".SplashActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
-<<<<<<< HEAD
-
-=======
->>>>>>> ProfilePictureUpdate
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
         <activity android:name=".Activity.RegisterActivity">
         </activity>
@@ -72,32 +67,12 @@
         <service android:name=".PrivateVehicles.App.Services.SyncFacebookFriendsToFirebase"/>
 
         <activity android:name=".PrivateVehicles.App.Activities.PersonDetail"/>
-<<<<<<< HEAD
         <activity android:name=".PrivateVehicles.App.Activities.ProfilePictureActivity"/>
-        <activity android:name=".PrivateVehicles.App.Activities.Test">
+        <activity android:name=".PrivateVehicles.App.Activities.test">
         </activity>
         <activity android:name=".PrivateVehicles.App.Activities.InitialDetailDialogs">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-=======
-        <activity
-            android:name=".PrivateVehicles.App.Activities.test"
-            android:label="@string/title_activity_test"
-            android:theme="@style/AppTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
 
         </activity>
-        <activity android:name=".PrivateVehicles.App.Activities.ProfilePictureActivity">
-
->>>>>>> ProfilePictureUpdate
-            </activity>
     </application>
 
 </manifest>

kute-android-app/app/src/main/java/com/scorelab/kute/kute/Activity/RegisterActivity.java

@@ -355,11 +355,8 @@ public void saveFacebookProfile(Profile pf)
         editor.putString("Login_Method","Facebook");
         editor.putString("Name", pf.getName());
         editor.putString("Id",pf.getId());
-<<<<<<< HEAD
-        editor.putString("Profile_Image","null");
-=======
         editor.putString("Profile_Image","null"); //It would contain some value when user sets a custom profile image
->>>>>>> ProfilePictureUpdate
+
         editor.putBoolean("Register_db",true);
         editor.putBoolean("Sync_Friends_db",true);
         editor.apply();

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Activities/CurrentFriendList.java

@@ -39,16 +39,13 @@ public class CurrentFriendList extends AppCompatActivity implements RecyclerItem
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.current_friends_activity);
-<<<<<<< HEAD
-        person_list = (ArrayList<Person>) getIntent().getSerializableExtra("FriendList");
-=======
+
         person_list = (ArrayList<String>)getIntent().getSerializableExtra("FriendList");
         person_detail_list=(ArrayList<Person>) getIntent().getSerializableExtra("FriendDetailList");
         /************** Initialise the views *********/
         //TODO get friends from facebook and google and get their images
         Log.d(TAG,"The length of the person list is:"+Integer.toString(person_list.size()));
         progressBar=(ProgressBar)findViewById(R.id.progressBar);
->>>>>>> ProfilePictureUpdate
         back = (ImageButton) findViewById(R.id.backNav);
         back.setOnClickListener(new View.OnClickListener() {
             @Override

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Activities/InitialDetailDialogs.java

@@ -118,6 +118,7 @@ private void handleFragmentNavigation(int nav_direction)
                     break;
                 case 3:
                     Intent pvi = new Intent(this, Main.class);
+                    pref.edit().putBoolean("update_profile_done",true).apply();
                     startActivity(pvi);
                     updateProfileOnDb();
                     finish();
@@ -194,12 +195,14 @@ private void handleMailFromVehicleFragment(String action,Object attachment){
     //Handle updating user profile on firebase after filling the details dialog activity
     private void updateProfileOnDb(){
         DatabaseReference m= FirebaseDatabase.getInstance().getReference().child("Users/"+pref.getString("Id","null"));
+        pref.edit().putString("Contact",contact).apply();
         m.child("contact_phone").setValue(contact).addOnFailureListener(new OnFailureListener() {
             @Override
             public void onFailure(@NonNull Exception e) {
                 Log.d(TAG, "Firebase conatct update error Error:" + e.toString());
             }
         });;
+        pref.edit().putString("Vehicle",vehicle_name).apply();
         m.child("vehicle").setValue(vehicle_name).addOnFailureListener(new OnFailureListener() {
             @Override
             public void onFailure(@NonNull Exception e) {

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Activities/PersonDetail.java

@@ -16,7 +16,7 @@
 
 import com.android.volley.toolbox.ImageLoader;
 import com.scorelab.kute.kute.PrivateVehicles.App.DataModels.Person;
-import com.scorelab.kute.kute.PrivateVehicles.App.Fragments.PlaceHolderFragment;
+import com.scorelab.kute.kute.PrivateVehicles.App.Fragments.FrameFragments.PlaceHolderFragment;
 import com.scorelab.kute.kute.PrivateVehicles.App.RoundedImageView;
 import com.scorelab.kute.kute.PrivateVehicles.App.Utils.VolleySingleton;
 import com.scorelab.kute.kute.R;

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Activities/ProfilePictureActivity.java

@@ -52,11 +52,9 @@ public class ProfilePictureActivity extends AppCompatActivity implements View.On
     CoordinatorLayout cl;
     String yourBase64String;
     String TAG ="ProfilePictureActivity";
-<<<<<<< HEAD
+
     Boolean did_profile_image_change=false;
     final int PROFILE_PICTURE_ACTIVITY_CODE=01;
-=======
->>>>>>> ProfilePictureUpdate
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -97,7 +95,6 @@ public void onClick(View v) {
                 break;
             case R.id.update:
                 String base_64=convertToBase64(current_image);
-<<<<<<< HEAD
                 did_profile_image_change=true;
                 saveNewImageToDb(base_64);
                 break;
@@ -108,11 +105,6 @@ public void onClick(View v) {
                     i.putExtra("ImageBase64String",yourBase64String);
                 }
                 setResult(PROFILE_PICTURE_ACTIVITY_CODE,i);
-=======
-                saveNewImageToDb(base_64);
-                break;
-            case R.id.backNav:
->>>>>>> ProfilePictureUpdate
                 finish();
                 break;
         }
@@ -194,20 +186,13 @@ protected void onRestoreInstanceState(Bundle savedInstanceState) {
     /******************** Custom Functions *************************/
     private void setupProfileImage()
     {
-<<<<<<< HEAD
+
         String Base64=pref.getString("Profile_Image",null);
         if(!(pref.getString("Profile_Image",null).equals("null"))){
             //Get the Image from base64 string stored in the prefs
             //This is the case when the user has a custom profile image
             Log.d(TAG,"User has custom profile image");
             base64ToBitmap(Base64);
-
-=======
-        if(pref.getString("Profile_Image",null)!="null"){
-            //Get the Image from base64 string stored in the prefs
-            //This is the case when the user has a custom profile image
->>>>>>> ProfilePictureUpdate
-
         }
         else {
             String img_url = String.format("https://graph.facebook.com/%s/picture?type=large", pref.getString("Id", "null"));
@@ -328,32 +313,20 @@ private void base64ToBitmap(String base64)
     {
         byte []imageBytes = Base64.decode(base64, Base64.DEFAULT);
         Bitmap decodedImage = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.length);
-<<<<<<< HEAD
         profile_image.setImageBitmap(decodedImage);
-=======
->>>>>>> ProfilePictureUpdate
         //imageView.setImageBitmap(decodedImage);
     }
     private void saveNewImageToDb(String base_64)
     {
-<<<<<<< HEAD
         DatabaseReference db_ref= FirebaseDatabase.getInstance().getReference("Users").child(pref.getString("Id","null")).child("img_base64");
         db_ref.setValue(base_64).addOnFailureListener(new OnFailureListener() {
-=======
-        DatabaseReference db_ref= FirebaseDatabase.getInstance().getReference("Users").child(pref.getString("Id","null"));
-        db_ref.setValue(new Person(pref.getString("Name","null"),pref.getString("Id","null"),base_64)).addOnFailureListener(new OnFailureListener() {
->>>>>>> ProfilePictureUpdate
             @Override
             public void onFailure(@NonNull Exception e) {
                 Log.d(TAG,"Update profile Image Firebase:"+e.toString());
             }
         });
         //Change the Shared Preference Value
-<<<<<<< HEAD
         pref.edit().putString("Profile_Image",base_64).apply();
-=======
-        pref.edit().putString("Profile_Image",base_64).commit();
->>>>>>> ProfilePictureUpdate
         Log.d(TAG,"Update Profile Image:Done");
     }
 

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Adapters/FriendRecyclerAdapter.java

@@ -1,7 +1,10 @@
 package com.scorelab.kute.kute.PrivateVehicles.App.Adapters;
 
 import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.support.v7.widget.RecyclerView;
+import android.util.Base64;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -100,10 +103,19 @@ private void configureGeneralItem(PersonItemViewHolder vh, int position) {
         /********* Test ******/
         RoundedImageView person_image =  vh.profile_pic;
         mImageLoader = VolleySingleton.getInstance(mcontext).getImageLoader();
-        String img_url = String.format("https://graph.facebook.com/%s/picture?type=normal", p.id);
-        //Log.d(TAG,"Image Url for ImageLoader is"+img_url);
-        mImageLoader.get(img_url, ImageLoader.getImageListener(person_image,
-                R.drawable.ic_person_black_36dp, R.drawable.ic_person_black_36dp));
+        if(p.img_base64.equals("null")){
+            String img_url = String.format("https://graph.facebook.com/%s/picture?type=normal", p.id);
+            //Log.d(TAG,"Image Url for ImageLoader is"+img_url);
+            mImageLoader.get(img_url, ImageLoader.getImageListener(person_image,
+                    R.drawable.ic_person_black_36dp, R.drawable.ic_person_black_36dp));
+        }else {
+            //TODO This task of converting base64 to bitmap can be offloaded to a handler Thread
+            Bitmap bm=base64ToBitmap(p.img_base64);
+            person_image.setImageBitmap(bm);
+        }
+
+
+
         /******** End of Test Data ********/
     }
 
@@ -112,5 +124,13 @@ private void configureRecyclerHead(HeaderRecyclerViewHolder vh) {
         vh.head_image.setBackgroundResource(R.drawable.community);
     }
     /******** End of Configuring of view holders ***************/
+    //Method to convert Base64 to bitmap
+    private Bitmap base64ToBitmap(String base64)
+    {
+        byte []imageBytes = Base64.decode(base64, Base64.DEFAULT);
+        Bitmap decodedImage = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.length);
+        return decodedImage;
+        //imageView.setImageBitmap(decodedImage);
+    }
 }
 

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/AsyncTasks/LoadFirebaseFriends.java

@@ -2,6 +2,7 @@
 
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.nfc.Tag;
 import android.os.AsyncTask;
 import android.util.Log;
 
@@ -50,11 +51,16 @@ protected Void doInBackground(Integer... params) {
                 get_friend.addListenerForSingleValueEvent(new ValueEventListener() {
                     @Override
                     public void onDataChange(DataSnapshot dataSnapshot) {
-                        Person p = dataSnapshot.getChildren().iterator().next().getValue(Person.class);
-                        if(async_task_listener!=null){
-                            //Check if the weak reference still exists
-                            Log.v(TAG,"Retrieved Friend "+p.name);
-                            taskListener.onTaskCompleted(p);
+                        try {
+                            //Added a a try except just to prevent finding those friends who does not exist now
+                            Person p = dataSnapshot.getChildren().iterator().next().getValue(Person.class);
+                            if (async_task_listener != null) {
+                                //Check if the weak reference still exists
+                                Log.v(TAG, "Retrieved Friend " + p.name);
+                                taskListener.onTaskCompleted(p);
+                            }
+                        }catch (Exception e){
+                            Log.i(TAG,"Error Receiving particular person details from firebase Person Might not Exist");
                         }
                     }
                     @Override

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Fragments/FriendFrame.java → kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Fragments/FrameFragments/FriendFrame.java

@@ -1,4 +1,4 @@
-package com.scorelab.kute.kute.PrivateVehicles.App.Fragments;
+package com.scorelab.kute.kute.PrivateVehicles.App.Fragments.FrameFragments;
 
 import android.content.Intent;
 import android.graphics.Bitmap;

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Fragments/PlaceHolderFragment.java → kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Fragments/FrameFragments/PlaceHolderFragment.java

@@ -1,4 +1,4 @@
-package com.scorelab.kute.kute.PrivateVehicles.App.Fragments;
+package com.scorelab.kute.kute.PrivateVehicles.App.Fragments.FrameFragments;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Fragments/RouteFrame.java → kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Fragments/FrameFragments/RouteFrame.java

@@ -1,4 +1,4 @@
-package com.scorelab.kute.kute.PrivateVehicles.App.Fragments;
+package com.scorelab.kute.kute.PrivateVehicles.App.Fragments.FrameFragments;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Fragments/TripFrame.java → kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Fragments/FrameFragments/TripFrame.java

@@ -1,4 +1,4 @@
-package com.scorelab.kute.kute.PrivateVehicles.App.Fragments;
+package com.scorelab.kute.kute.PrivateVehicles.App.Fragments.FrameFragments;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;