MyHyvesBookPlus/TheReturnOfTheMyHyvesBookPlus
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/marijn-appje' into niels-profile

Browse Source
This commit is contained in:
Niels Zwemmer
2017-06-23 14:35:50 +02:00
parent 0e25ff63cc b570e5ef21
commit c78f01dbfe
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/UploadClass.java → app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/UploadClass.java
View File

@@ -1,4 +1,4 @@
package nl.myhyvesbookplus.tagram; package nl.myhyvesbookplus.tagram.controller;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.net.Uri; import android.net.Uri;
@@ -23,10 +23,11 @@ import java.io.ByteArrayOutputStream;
import nl.myhyvesbookplus.tagram.model.BitmapPost; import nl.myhyvesbookplus.tagram.model.BitmapPost;
import nl.myhyvesbookplus.tagram.model.UriPost; import nl.myhyvesbookplus.tagram.model.UriPost;
/** import static java.lang.System.currentTimeMillis;
* Created by marijnjansen on 20/06/2017.
*/
/**
* Class that does all the photo uploading things.
*/
public class UploadClass { public class UploadClass {
private static final String TAG = "UploadClass"; private static final String TAG = "UploadClass";
@@ -46,12 +47,20 @@ public class UploadClass {
return baos.toByteArray(); return baos.toByteArray();
} }
private String getUserUid() {
FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
if (user != null) {
return user.getUid();
}
return "";
}
/// Post Uploads /// /// Post Uploads ///
public void uploadPicture(final BitmapPost post) { public void uploadPicture(final BitmapPost post) {
final String name = getUserUid() + currentTimeMillis();
UploadTask uploadTask = mStorageRef.child("posts").child(name + ".jpg").putBytes(bitmapToBytes(post.getBitmap()));
UploadTask uploadTask = mStorageRef.child("posts").child("UniquePostName" + ".jpg").putBytes(bitmapToBytes(post.getBitmap()));
uploadTask.addOnFailureListener(new OnFailureListener() { uploadTask.addOnFailureListener(new OnFailureListener() {
@Override @Override
public void onFailure(@NonNull Exception e) { public void onFailure(@NonNull Exception e) {
@@ -64,14 +73,14 @@ public class UploadClass {
// Handle successful uploads on complete // Handle successful uploads on complete
Log.d(TAG, "onSuccess: Upload Success!"); Log.d(TAG, "onSuccess: Upload Success!");
Uri downloadUrl = taskSnapshot.getMetadata().getDownloadUrl(); Uri downloadUrl = taskSnapshot.getMetadata().getDownloadUrl();
putPostInDatabase(post.getUriPost(downloadUrl)); putPostInDatabase(post.getUriPost(downloadUrl), name);
} }
}); });
} }
private void putPostInDatabase(UriPost post) { private void putPostInDatabase(UriPost post, String name) {
DatabaseReference ref = mDataRef.child("posts").child("UniquePostName"); // TODO: Naam voor post. DatabaseReference ref = mDataRef.child("posts").child(name);
ref.setValue(post) // FIXME: Grote boos veroorzaker ref.setValue(post)
.addOnCompleteListener(new OnCompleteListener<Void>() { .addOnCompleteListener(new OnCompleteListener<Void>() {
@Override @Override
public void onComplete(@NonNull Task<Void> task) { public void onComplete(@NonNull Task<Void> task) {
@@ -84,19 +93,11 @@ public class UploadClass {
}); });
} }
private String getUserUid() {
FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
if (user != null) {
return user.getUid();
}
return "";
}
/// Profile picture /// /// Profile picture ///
protected void uploadProfilePicture(Bitmap picture) { public void uploadProfilePicture(Bitmap picture) {
byte[] uploadPhoto = bitmapToBytes(picture); byte[] uploadPhoto = bitmapToBytes(picture);
UploadTask photoUpload = mStorageRef.child("profile").child(getUserUid()).putBytes(uploadPhoto); UploadTask photoUpload = mStorageRef.child("profile").child(getUserUid() + "_" + currentTimeMillis()).putBytes(uploadPhoto);
photoUpload.addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() { photoUpload.addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
@Override @Override
public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) { public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {