From 470e6a60754880bb1ce66e376c155e075afd15d3 Mon Sep 17 00:00:00 2001 From: Georg Reisinger <43533139+GeorgReisinger@users.noreply.github.com> Date: Tue, 19 Mar 2019 22:04:11 +0100 Subject: [PATCH] Edit User Final Alles Funktioniert jetzt wirklich --- .idea/caches/gradle_models.ser | Bin 277282 -> 277282 bytes .../smartshopper/activitys/EditUser.java | 61 +++++++++--------- .../smartshopper/db/Database.java | 5 +- .../shoppinglist/ShoppinglistAdapter.java | 2 +- .../ShoppinglistSharedAdapter.java | 4 +- 5 files changed, 38 insertions(+), 34 deletions(-) diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index 23e45fb50b3cac8536d77ff0f0782a4d6fbcd598..f3f6681b5a84b857536c2456310d3f164789686e 100644 GIT binary patch delta 161 zcmZ4VO<>VCfeqcNEEekxk~a6NX4tZ5O^)Vn{+-nRJBbm9nYRB^e433VqJGYw?PoqSbJ?*Sjb3&HCi&iw#f?cOlGAuO0|NtNAwwOb0+3)j vQVb;d+BHh!@}~!yuq;wwIu8=)1_?8WmV!tLs0KlU&u=7(w+oxH@UsB`uwyzV delta 161 zcmZ4VO<>VCfeqcNEYFYU&fnaxnqkXwuPD;A`FB$L?<7VbX4?KciTPzG+q@Ey7RG|< zhX0s^xBq>^e435LX>YZ__A{TEx$M|xowPazlYDQ;;>IK+UlslIKM)i$)G;am38o{( xK$5RrqckpedY}o*A_cxakU%#`m_f7@L`pC)Ffalcf(E-{9X4(kHf7;w0{~N>K8FAR diff --git a/app/src/main/java/at/smartshopper/smartshopper/activitys/EditUser.java b/app/src/main/java/at/smartshopper/smartshopper/activitys/EditUser.java index 715aa33..dd3364f 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/activitys/EditUser.java +++ b/app/src/main/java/at/smartshopper/smartshopper/activitys/EditUser.java @@ -110,39 +110,15 @@ public class EditUser extends Activity { arlist.add(userBitmap); arlist.add(FirebaseAuth.getInstance().getUid()); + arlist.add(editname.getText().toString()); Object[] objArr = arlist.toArray(); ImgSaver imgSaver = new ImgSaver(); - String uri = null; + String[] uri = null; String name = editname.getText().toString(); try { - uri = imgSaver.execute(objArr).get(); + imgSaver.execute(objArr).get(); - Log.d("SmartShopper", uri + " " + name); - UserProfileChangeRequest profileUpdates = new UserProfileChangeRequest.Builder() - .setDisplayName(name) - .setPhotoUri(Uri.parse(uri)) - .build(); - try { - Member member = db.getUser(FirebaseAuth.getInstance().getUid()); - db.updateUser(FirebaseAuth.getInstance().getUid(), member.getMsid(), name, FirebaseAuth.getInstance().getCurrentUser().getPhotoUrl().toString(), member.getEmail()); - } catch (SQLException e) { - e.printStackTrace(); - } catch (JSONException e) { - e.printStackTrace(); - } - - user.updateProfile(profileUpdates) - .addOnCompleteListener(new OnCompleteListener() { - @Override - public void onComplete(@NonNull Task task) { - if (task.isSuccessful()) { - Log.d("SmartShopper", "User profile updated."); - doRestart(EditUser.this); - } - } - }); - } catch (ExecutionException e) { e.printStackTrace(); } catch (InterruptedException e) { @@ -440,13 +416,13 @@ public class EditUser extends Activity { } } - public class ImgSaver extends AsyncTask { + public class ImgSaver extends AsyncTask { private FirebaseStorage storage = FirebaseStorage.getInstance(); private String downloadUriFinal = ""; @Override - protected String doInBackground(Object... objects) { + protected Void doInBackground(Object... objects) { // Log.d("SmartShopper", objects[0].toString() + objects[1].toString()); final StorageReference storageRef = storage.getReference("/" + objects[1]); @@ -468,16 +444,41 @@ public class EditUser extends Activity { }).addOnCompleteListener(new OnCompleteListener() { @Override public void onComplete(@NonNull Task task) { + String name = editname.getText().toString(); if (task.isSuccessful()) { Uri downloadUri = task.getResult(); Log.d("SmartShopper", downloadUri.toString()); downloadUriFinal = downloadUri.toString(); + Log.d("SmartShopper", downloadUriFinal + " " + name); + UserProfileChangeRequest profileUpdates = new UserProfileChangeRequest.Builder() + .setDisplayName(name) + .setPhotoUri(Uri.parse(downloadUriFinal)) + .build(); + try { + Member member = db.getUser(FirebaseAuth.getInstance().getUid()); + db.updateUser(FirebaseAuth.getInstance().getUid(), member.getMsid(), name, downloadUriFinal, member.getEmail()); + } catch (SQLException e) { + e.printStackTrace(); + } catch (JSONException e) { + e.printStackTrace(); + } + + user.updateProfile(profileUpdates) + .addOnCompleteListener(new OnCompleteListener() { + @Override + public void onComplete(@NonNull Task task) { + if (task.isSuccessful()) { + Log.d("SmartShopper", "User profile updated."); + doRestart(EditUser.this); + } + } + }); } else { System.out.println(task.getException().getMessage()); } } }); - return downloadUriFinal; + return null; } } } diff --git a/app/src/main/java/at/smartshopper/smartshopper/db/Database.java b/app/src/main/java/at/smartshopper/smartshopper/db/Database.java index abe9bbe..4d8f978 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/db/Database.java +++ b/app/src/main/java/at/smartshopper/smartshopper/db/Database.java @@ -119,7 +119,7 @@ public class Database { newname = name; } if (picture.isEmpty() || picture.equals(" ")) { - newpicture = "https://i0.wp.com/www.windowspower.de/wp-content/uploads/2015/10/profilbilde-windows-10.jpg?fit=610%2C340&ssl=1"; + newpicture = picture; } else { newpicture = picture; } @@ -485,6 +485,9 @@ public class Database { */ public void createUser(String username, String message_id, String name, String picture, String email) throws SQLException { String SQL = "INSERT INTO \"User\" (username, message_id, name, picture, email) VALUES (?, ?, ?, ?, ?)"; + if(picture.isEmpty()){ + picture = "https://st2.depositphotos.com/1537427/5927/v/950/depositphotos_59279377-stock-illustration-user-icon.jpg"; + } sqlUpdate5Param(SQL, username, message_id, name, picture, email); } diff --git a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistAdapter.java b/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistAdapter.java index 7a2adf4..631f491 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistAdapter.java +++ b/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistAdapter.java @@ -124,7 +124,7 @@ String uid = FirebaseAuth.getInstance().getUid(); try { Member user = db.getUser(uid); holder.ownerName.setText(user.getName()); - Picasso.get().load(user.getPic()).resize(250, 250).transform(new RoundCornersTransformation(30, 30, true, true)).into(holder.imageView); + Picasso.get().load(user.getPic()).resize(250, 250).transform(new RoundCornersTransformation(15, 15, true, true)).into(holder.imageView); } catch (SQLException e) { e.printStackTrace(); } catch (JSONException e) { diff --git a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistSharedAdapter.java b/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistSharedAdapter.java index 81f9d75..b5fe898 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistSharedAdapter.java +++ b/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistSharedAdapter.java @@ -117,7 +117,7 @@ public class ShoppinglistSharedAdapter extends RecyclerView.Adapter