From 645cdc90f9aeb8dc1db12e98706a7f14b5921fac Mon Sep 17 00:00:00 2001 From: NMerz Date: Fri, 4 Dec 2020 12:25:14 -0500 Subject: [PATCH] Ready for presentation --- Lambdas/Lists/Chain/test/TestChainGetter.java | 2 +- Lambdas/Lists/Item/test/TestItemGetter.java | 2 +- .../ItemSearch/test/TestItemSearcher.java | 2 +- .../ListDuplicate/test/TestListDuplicate.java | 2 +- .../test/TestListReposition.java | 2 +- .../Lists/Picture/test/TestPictureGetter.java | 2 +- .../Lists/Picture/test/TestPicturePutter.java | 2 +- .../test/TestSearchHistoryGetter.java | 2 +- .../test/TestSearchHistoryUpdater.java | 2 +- Lambdas/Lists/User/src/UserDeleter.java | 2 +- .../com/example/listify/ConfirmShareView.java | 4 ++ .../com/example/listify/MainActivity.java | 55 +++++++++---------- .../ShoppingListsSwipeableAdapter.java | 34 ++++++++---- 13 files changed, 62 insertions(+), 51 deletions(-) diff --git a/Lambdas/Lists/Chain/test/TestChainGetter.java b/Lambdas/Lists/Chain/test/TestChainGetter.java index b217e2f..904d1f7 100644 --- a/Lambdas/Lists/Chain/test/TestChainGetter.java +++ b/Lambdas/Lists/Chain/test/TestChainGetter.java @@ -1,4 +1,4 @@ -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.sql.SQLException; diff --git a/Lambdas/Lists/Item/test/TestItemGetter.java b/Lambdas/Lists/Item/test/TestItemGetter.java index 901e535..d869c94 100644 --- a/Lambdas/Lists/Item/test/TestItemGetter.java +++ b/Lambdas/Lists/Item/test/TestItemGetter.java @@ -1,4 +1,4 @@ -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.math.BigDecimal; diff --git a/Lambdas/Lists/ItemSearch/test/TestItemSearcher.java b/Lambdas/Lists/ItemSearch/test/TestItemSearcher.java index fb11224..a143b47 100644 --- a/Lambdas/Lists/ItemSearch/test/TestItemSearcher.java +++ b/Lambdas/Lists/ItemSearch/test/TestItemSearcher.java @@ -1,4 +1,4 @@ -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.sql.SQLException; diff --git a/Lambdas/Lists/ListDuplicate/test/TestListDuplicate.java b/Lambdas/Lists/ListDuplicate/test/TestListDuplicate.java index ced76fb..1a6cd9e 100644 --- a/Lambdas/Lists/ListDuplicate/test/TestListDuplicate.java +++ b/Lambdas/Lists/ListDuplicate/test/TestListDuplicate.java @@ -1,4 +1,4 @@ -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.sql.SQLException; diff --git a/Lambdas/Lists/ListReposition/test/TestListReposition.java b/Lambdas/Lists/ListReposition/test/TestListReposition.java index 8212fdb..642ed8c 100644 --- a/Lambdas/Lists/ListReposition/test/TestListReposition.java +++ b/Lambdas/Lists/ListReposition/test/TestListReposition.java @@ -1,4 +1,4 @@ -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.sql.SQLException; diff --git a/Lambdas/Lists/Picture/test/TestPictureGetter.java b/Lambdas/Lists/Picture/test/TestPictureGetter.java index 2af43e3..99eb210 100644 --- a/Lambdas/Lists/Picture/test/TestPictureGetter.java +++ b/Lambdas/Lists/Picture/test/TestPictureGetter.java @@ -1,4 +1,4 @@ -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.sql.SQLException; diff --git a/Lambdas/Lists/Picture/test/TestPicturePutter.java b/Lambdas/Lists/Picture/test/TestPicturePutter.java index fc30141..5850150 100644 --- a/Lambdas/Lists/Picture/test/TestPicturePutter.java +++ b/Lambdas/Lists/Picture/test/TestPicturePutter.java @@ -1,4 +1,4 @@ -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.sql.SQLException; diff --git a/Lambdas/Lists/SearchHistory/test/TestSearchHistoryGetter.java b/Lambdas/Lists/SearchHistory/test/TestSearchHistoryGetter.java index 20e0cea..0ceca41 100644 --- a/Lambdas/Lists/SearchHistory/test/TestSearchHistoryGetter.java +++ b/Lambdas/Lists/SearchHistory/test/TestSearchHistoryGetter.java @@ -1,4 +1,4 @@ -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.sql.SQLException; diff --git a/Lambdas/Lists/SearchHistory/test/TestSearchHistoryUpdater.java b/Lambdas/Lists/SearchHistory/test/TestSearchHistoryUpdater.java index 99e9d8c..86fd245 100644 --- a/Lambdas/Lists/SearchHistory/test/TestSearchHistoryUpdater.java +++ b/Lambdas/Lists/SearchHistory/test/TestSearchHistoryUpdater.java @@ -1,4 +1,4 @@ -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.sql.SQLException; diff --git a/Lambdas/Lists/User/src/UserDeleter.java b/Lambdas/Lists/User/src/UserDeleter.java index 99c9c5b..409fdd7 100644 --- a/Lambdas/Lists/User/src/UserDeleter.java +++ b/Lambdas/Lists/User/src/UserDeleter.java @@ -40,7 +40,7 @@ public class UserDeleter implements CallHandler { private final String DELETE_LISTS = "DELETE FROM List WHERE (owner = ?);"; private final String DELETE_LIST_SHARES = "DELETE FROM ListSharee WHERE (listID = ?);"; private final String DELETE_LIST_ACCESS = "DELETE FROM ListSharee WHERE (userID = ?);"; - private final String DELETE_PROFILE_PICTURE = "DELETE FROM Pictures WHERE (userID = ?);"; + private final String DELETE_PROFILE_PICTURE = "DELETE FROM Pictures WHERE (cognitoID = ?);"; public UserDeleter(Connection connection, String cognitoID) { this.connection = connection; diff --git a/Listify/app/src/main/java/com/example/listify/ConfirmShareView.java b/Listify/app/src/main/java/com/example/listify/ConfirmShareView.java index 35e837c..196af65 100644 --- a/Listify/app/src/main/java/com/example/listify/ConfirmShareView.java +++ b/Listify/app/src/main/java/com/example/listify/ConfirmShareView.java @@ -43,6 +43,10 @@ public class ConfirmShareView extends AppCompatActivity { try { requestor.getObject(shareeEmail, User.class, userReceiver); String shareeID = userReceiver.await().getCognitoID(); + if (shareeID == null) { + setResult(RESULT_CANCELED,null); + finish(); + } requestor.getObject(shareeID, Picture.class, profilePictureReceiver); profilePictureView.setImageURI(Uri.fromFile(saveImage(profilePictureReceiver.await().getBase64EncodedImage(), "shareeProfilePicture"))); } catch (Exception e) { diff --git a/Listify/app/src/main/java/com/example/listify/MainActivity.java b/Listify/app/src/main/java/com/example/listify/MainActivity.java index d4658a1..c0adf36 100644 --- a/Listify/app/src/main/java/com/example/listify/MainActivity.java +++ b/Listify/app/src/main/java/com/example/listify/MainActivity.java @@ -1,13 +1,9 @@ package com.example.listify; -import android.Manifest; import android.app.AlertDialog; import android.content.Context; import android.content.Intent; -import android.content.pm.PackageManager; import android.database.Cursor; -import android.location.Location; -import android.location.LocationManager; import android.net.Uri; import android.os.Bundle; import android.os.Environment; @@ -24,7 +20,6 @@ import android.widget.TextView; import android.widget.Toast; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; -import androidx.core.app.ActivityCompat; import androidx.core.content.FileProvider; import androidx.drawerlayout.widget.DrawerLayout; import androidx.navigation.NavController; @@ -84,31 +79,31 @@ public class MainActivity extends AppCompatActivity implements CreateListDialogF startActivity(intent); } - LocationManager lm = (LocationManager) getSystemService(Context.LOCATION_SERVICE); - if(checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) { - Log.d("CHECKING", "WORKS"); - } else { - ActivityCompat.requestPermissions( - this, - new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, - 0 - ); - } - Location location; - - while(true) { - try { - location = lm.getLastKnownLocation(LocationManager.GPS_PROVIDER); - break; - } catch(java.lang.SecurityException e) { - //User clicked delete - } - } - - if(location != null) { - double longitude = location.getLongitude(); - double latitude = location.getLatitude(); - } +// LocationManager lm = (LocationManager) getSystemService(Context.LOCATION_SERVICE); +// if(checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) { +// Log.d("CHECKING", "WORKS"); +// } else { +// ActivityCompat.requestPermissions( +// this, +// new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, +// 0 +// ); +// } +// Location location; +// +// while(true) { +// try { +// location = lm.getLastKnownLocation(LocationManager.GPS_PROVIDER); +// break; +// } catch(java.lang.SecurityException e) { +// //User clicked delete +// } +// } +// +// if(location != null) { +// double longitude = location.getLongitude(); +// double latitude = location.getLatitude(); +// } //------------------------------Auth Testing---------------------------------------------// diff --git a/Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsSwipeableAdapter.java b/Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsSwipeableAdapter.java index 28c4f43..b10823d 100644 --- a/Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsSwipeableAdapter.java +++ b/Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsSwipeableAdapter.java @@ -13,7 +13,7 @@ import com.chauthai.swipereveallayout.SwipeRevealLayout; import com.chauthai.swipereveallayout.ViewBinderHelper; import com.example.listify.*; import com.example.listify.data.List; -import com.example.listify.data.ListShare; +import com.example.listify.data.User; import org.json.JSONException; import java.io.IOException; @@ -25,6 +25,7 @@ import static com.example.listify.MainActivity.am; public class ShoppingListsSwipeableAdapter extends BaseAdapter { private Activity activity; private ArrayList lists; + private ArrayList emails; private LayoutInflater inflater; private ViewHolder holder; private Requestor requestor; @@ -34,6 +35,23 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter { binderHelper = new ViewBinderHelper(); this.activity = activity; this.lists = lists; + this.emails = new ArrayList<>(); + Properties configs = new Properties(); + try { + configs = AuthManager.loadProperties(activity, "android.resource://" + activity.getPackageName() + "/raw/auths.json"); + } catch (IOException | JSONException e) { + e.printStackTrace(); + } + requestor = new Requestor(am, configs.getProperty("apiKey")); + SynchronousReceiver emailReceiver = new SynchronousReceiver(); + for (List list : lists) { + requestor.getObject(list.getOwner(), User.class, emailReceiver); + try { + emails.add(emailReceiver.await().getEmail()); + } catch (Exception e) { + e.printStackTrace(); + } + } } @Override @@ -53,13 +71,6 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter { @Override public View getView(int position, View convertView, ViewGroup parent) { - Properties configs = new Properties(); - try { - configs = AuthManager.loadProperties(activity, "android.resource://" + activity.getPackageName() + "/raw/auths.json"); - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - requestor = new Requestor(am, configs.getProperty("apiKey")); if (inflater == null) { inflater = (LayoutInflater)activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); @@ -88,12 +99,12 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter { holder.listName.setText(curList.getName()); if(curList.isShared()) { - holder.listName.setText(curList.getName() + " (shared by User " + curList.getOwner() + ")"); + holder.listName.setText(curList.getName() + " (shared by " + emails.get(position) + ")"); String listText = holder.listName.getText().toString(); - if(listText.length() > 25) { - holder.listName.setText(listText.substring(0, 25) + "..."); + if(listText.length() > 27) { + holder.listName.setText(listText.substring(0, 27) + "..."); } } @@ -117,6 +128,7 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter { Toast.makeText(activity, String.format("%s deleted", curList.getName()), Toast.LENGTH_SHORT).show(); lists.remove(position); + emails.remove(position); // Update listView notifyDataSetChanged();