dergeorg/SmartShopperAndroid
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Edit User Final

Browse Source 
Alles Funktioniert jetzt wirklich
This commit is contained in:
Georg Reisinger
2019-03-19 22:04:11 +01:00
parent 09e839dcd0
commit 470e6a6075
5 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/gradle_models.ser generated
View File

Binary file not shown.

61
app/src/main/java/at/smartshopper/smartshopper/activitys/EditUser.java
View File

@@ -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<Void>() {
@Override
public void onComplete(@NonNull Task<Void> 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<Object, String, String> {
public class ImgSaver extends AsyncTask<Object, Void, Void> {
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<Uri>() {
@Override
public void onComplete(@NonNull Task<Uri> 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<Void>() {
@Override
public void onComplete(@NonNull Task<Void> task) {
if (task.isSuccessful()) {
Log.d("SmartShopper", "User profile updated.");
doRestart(EditUser.this);
}
}
});
} else {
System.out.println(task.getException().getMessage());
}
}
});
return downloadUriFinal;
return null;
}
}
}

5
app/src/main/java/at/smartshopper/smartshopper/db/Database.java
View File

@@ -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);
}

2
app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistAdapter.java
View File

@@ -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) {

4
app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistSharedAdapter.java
View File

@@ -117,7 +117,7 @@ public class ShoppinglistSharedAdapter extends RecyclerView.Adapter<Shoppinglist
String name = user.getDisplayName();
Uri photoUrl = user.getPhotoUrl();
holder.ownerName.setText(name);
Picasso.get().load(photoUrl).resize(250, 250).transform(new RoundCornersTransformation(30, 30, true, true)).into(holder.imageView);
Picasso.get().load(photoUrl).resize(250, 250).transform(new RoundCornersTransformation(15, 15, true, true)).into(holder.imageView);
// holder.imageView.setImageDrawable(Drawable.createFromPath("@drawable/common_google_signin_btn_icon_dark"));
// Check if user's email is verified
@@ -129,7 +129,7 @@ public class ShoppinglistSharedAdapter extends RecyclerView.Adapter<Shoppinglist
}
try {
Member admin = db.getAdmin(shoppinglist.getSlId());
Picasso.get().load(admin.getPic()).resize(250, 250).transform(new RoundCornersTransformation(30, 30, true, true)).into(holder.imageView);
Picasso.get().load(admin.getPic()).resize(250, 250).transform(new RoundCornersTransformation(15, 15, true, true)).into(holder.imageView);
holder.ownerName.setText(admin.getName());
} catch (SQLException e) {
e.printStackTrace();