From fe8d6cbae655b0008b6694f552beac24dd9147ee Mon Sep 17 00:00:00 2001 From: Aaron Sun Date: Wed, 2 Dec 2020 15:12:50 -0800 Subject: [PATCH 1/2] Sharee lists updates on the spot after adding or deleting sharee --- Lambdas/Lists/ListShare/src/ListShareGetter.java | 2 -- Lambdas/Lists/ListShare/src/ListSharer.java | 5 ----- .../app/src/main/java/com/example/listify/ListSharees.java | 7 +++++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Lambdas/Lists/ListShare/src/ListShareGetter.java b/Lambdas/Lists/ListShare/src/ListShareGetter.java index 6e39d81..03d6e8d 100644 --- a/Lambdas/Lists/ListShare/src/ListShareGetter.java +++ b/Lambdas/Lists/ListShare/src/ListShareGetter.java @@ -59,8 +59,6 @@ public class ListShareGetter implements CallHandler{ } } - - //Insert the ListShare objects to hold the data of the remaining rows into first's ListShare list while (getListResults.next()) { InvokeRequest invokeRequest = new InvokeRequest(); diff --git a/Lambdas/Lists/ListShare/src/ListSharer.java b/Lambdas/Lists/ListShare/src/ListSharer.java index 2273399..53359d2 100644 --- a/Lambdas/Lists/ListShare/src/ListSharer.java +++ b/Lambdas/Lists/ListShare/src/ListSharer.java @@ -58,11 +58,6 @@ public class ListSharer implements CallHandler { throw new InputMismatchException("Could not find specified user to share with"); } String shareWithSub = new Gson().fromJson(new String(invokeResult.getPayload().array()), User.class).cognitoID; -// checkAccess.setString(2, shareWithSub); -// checkAccessRS = checkAccess.executeQuery(); -// if (checkAccessRS.next()) { -// throw new InputMismatchException("The specified user already has access"); -// } PreparedStatement uiPositionCheck = connection.prepareStatement(UI_POSITION_CHECK); uiPositionCheck.setString(1, shareWithSub); diff --git a/Listify/app/src/main/java/com/example/listify/ListSharees.java b/Listify/app/src/main/java/com/example/listify/ListSharees.java index 4636321..9ff3061 100644 --- a/Listify/app/src/main/java/com/example/listify/ListSharees.java +++ b/Listify/app/src/main/java/com/example/listify/ListSharees.java @@ -59,6 +59,9 @@ public class ListSharees extends AppCompatActivity implements Requestor.Receiver ListShare listShare = new ListShare(listID, sharedEmail, "Read, Write, Delete, Share", null); try { requestor.putObject(listShare); + lShareeEntries.add(listShare); + lShareeEmails.add(sharedEmail); + myAdapter.notifyDataSetChanged(); } catch(Exception e) { e.printStackTrace(); @@ -72,8 +75,8 @@ public class ListSharees extends AppCompatActivity implements Requestor.Receiver ListShare sharee = (ListShare) delivered; if(sharee != null) { - lShareeEmails.add(sharee.getShareWithEmail()); lShareeEntries.add(sharee); + lShareeEmails.add(sharee.getShareWithEmail()); if(sharee.getEntries() != null) { for(ListShare ls : sharee.getEntries()) { @@ -119,7 +122,7 @@ public class ListSharees extends AppCompatActivity implements Requestor.Receiver try { lShareeEntries.get(position).setPermissionLevel(0); ListShare toRemove = lShareeEntries.remove(position); - System.out.println(toRemove); + lShareeEmails.remove(position); requestor.putObject(toRemove); myAdapter.notifyDataSetChanged(); } From 19731cebcfb767c86a96ea1fd337b9391a7c9920 Mon Sep 17 00:00:00 2001 From: Aaron Sun Date: Wed, 2 Dec 2020 15:20:06 -0800 Subject: [PATCH 2/2] Removed owner from sharee list --- .../app/src/main/java/com/example/listify/ListSharees.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Listify/app/src/main/java/com/example/listify/ListSharees.java b/Listify/app/src/main/java/com/example/listify/ListSharees.java index 9ff3061..464214c 100644 --- a/Listify/app/src/main/java/com/example/listify/ListSharees.java +++ b/Listify/app/src/main/java/com/example/listify/ListSharees.java @@ -55,7 +55,6 @@ public class ListSharees extends AppCompatActivity implements Requestor.Receiver public void onClick(View v) { EditText sharedEmailText = (EditText) findViewById(R.id.editTextShareeEmail); String sharedEmail = sharedEmailText.getText().toString(); - ListShare listShare = new ListShare(listID, sharedEmail, "Read, Write, Delete, Share", null); try { requestor.putObject(listShare); @@ -132,6 +131,11 @@ public class ListSharees extends AppCompatActivity implements Requestor.Receiver } }); + if(shareeEmail.getText().toString().equals(am.getEmail(requestor))) { + shareeEmail.setVisibility(View.GONE); + removeSharee.setVisibility(View.GONE); + } + return listproduct; } }