fixed crashes

Author: nbhuiyan

app/src/main/java/com/cmput301f17t11/cupofjava/Views/HabitEventTimeLineActivity.java

@@ -56,8 +56,8 @@ public class HabitEventTimeLineActivity extends Fragment {
     private ListView listView;
     private TextView textView;
     private Button viewMap;
-    private double currentLat; //latitude of current loc
-    private double currentLon; //Longitude of current loc
+    //private double currentLat; //latitude of current loc
+    //private double currentLon; //Longitude of current loc
 
 
     ArrayList<HabitEvent> events = new ArrayList<>();
@@ -91,12 +91,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         Bundle bundle = getArguments();
         if (bundle != null) {
             this.userName = bundle.getString("userName");
-            this.currentLat = bundle.getDouble("currentLat");
-            this.currentLon = bundle.getDouble("currentLon");
+            //this.currentLat = bundle.getDouble("currentLat");
+            //this.currentLon = bundle.getDouble("currentLon");
 
             Log.i("HabitEventTimelineFragment: Username received: ", userName);
-            Log.i("HabitEventTimelineFragment: Latitude received: ", ""+currentLat+"");
-            Log.i("HabitEventTimelineFragment: Latitude received: ", ""+currentLon+"");
+            //Log.i("HabitEventTimelineFragment: Latitude received: ", ""+currentLat+"");
+            //Log.i("HabitEventTimelineFragment: Latitude received: ", ""+currentLon+"");
 
         }
 
@@ -409,8 +409,8 @@ public void mapsAll(int type ){
         bundle.putDoubleArray("lat", latititudes);
         bundle.putDoubleArray("lon", longitudes);
         bundle.putInt("type", type );
-        bundle.putDouble("currentLat", currentLat);
-        bundle.putDouble("currentLon", currentLon);
+        //bundle.putDouble("currentLat", currentLat);
+        //bundle.putDouble("currentLon", currentLon);
 
         intent.putExtras(bundle);
         startActivity(intent);

app/src/main/java/com/cmput301f17t11/cupofjava/Views/MainActivity.java

@@ -17,8 +17,8 @@
 public class MainActivity extends AppCompatActivity{
 
     private String userName;
-    private double currentLat;
-    private double currentLon;
+    //private double currentLat;
+    //private double currentLon;
 
     private BottomNavigationView.OnNavigationItemSelectedListener onNavigationItemSelectedListener
             = new BottomNavigationView.OnNavigationItemSelectedListener() {
@@ -28,8 +28,8 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
                 case R.id.navigation_timeline:
                     Bundle bundle1 = new Bundle();
                     bundle1.putString("userName", userName);
-                    bundle1.putDouble("currentLat", currentLat);
-                    bundle1.putDouble("currentLon", currentLon);
+                    //bundle1.putDouble("currentLat", currentLat);
+                    //bundle1.putDouble("currentLon", currentLon);
                     TimeLineFragment timeLineFragment = new TimeLineFragment();
                     timeLineFragment.setArguments(bundle1);
                     FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
@@ -100,8 +100,8 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
         this.userName = getIntent().getStringExtra("userName");
-        this.currentLat = getIntent().getDoubleExtra("currentLat",0.0);
-        this.currentLon = getIntent().getDoubleExtra("currentLon", 0.0);
+        //this.currentLat = getIntent().getDoubleExtra("currentLat",0.0);
+        //this.currentLon = getIntent().getDoubleExtra("currentLon", 0.0);
         BottomNavigationView navigation = (BottomNavigationView) findViewById(R.id.menu);
         navigation.setSelectedItemId(R.id.navigation_social);
         navigation.setOnNavigationItemSelectedListener(onNavigationItemSelectedListener);

app/src/main/java/com/cmput301f17t11/cupofjava/Views/UserLoginActivity.java

@@ -35,8 +35,8 @@ public class UserLoginActivity extends Activity {
     private User newUser;
     private User user;
 
-    double currentLat;
-    double currentLong;
+    //double currentLat;
+    //double currentLong;
     Geolocation location;
 
     /**
@@ -60,11 +60,11 @@ protected void onCreate(Bundle savedInstanceState) {
             @Override
             public void onClick(View v) {
 
-                Log.i("Location is ", location.getLocation().toString());
-                currentLat = location.getLocation().getLatitude();
-                currentLong = location.getLocation().getLongitude();
-                Log.i("Latitude ", "" + currentLat + "");
-                Log.i("Latitude ", "" + currentLong + "");
+                //Log.i("Location is ", location.getLocation().toString());
+                //currentLat = location.getLocation().getLatitude();
+                //currentLong = location.getLocation().getLongitude();
+                //Log.i("Latitude ", "" + currentLat + "");
+                //Log.i("Latitude ", "" + currentLong + "");
 
 
                 String input = username_editText.getText().toString();
@@ -88,8 +88,8 @@ public void onClick(View v) {
                         //sending the user info to main activity
                         Intent intent = new Intent(UserLoginActivity.this, MainActivity.class);
                         intent.putExtra("userName", newUser.getUsername());
-                        intent.putExtra("currentLat", currentLat);
-                        intent.putExtra("currentLon", currentLong);
+                        //intent.putExtra("currentLat", currentLat);
+                        //intent.putExtra("currentLon", currentLong);
 
                         startActivity(intent);