Merge pull request #100 from learning-layers/integration

Release v1.8.2
learning-layers · Dec 18, 2016 · 9db314e · 9db314e
2 parents 0bd41d9 + b170cac
commit 9db314e
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 8 deletions.
diff --git a/app/src/main/java/fi/aalto/legroup/achso/authentication/LoginManager.java b/app/src/main/java/fi/aalto/legroup/achso/authentication/LoginManager.java
@@ -129,6 +129,21 @@ public User getUser() {
         return user;
     }
 
+    public boolean isDefaultUser(User user) {
+        String name = user.getName();
+
+        // TODO: Better way of doing this
+        if (name.equals("Unknown") || name.equals("Unbekannt") || name.equals("Tuntematon") || name.equals("Tundmatu")) {
+            return true;
+        }
+
+        if (user.equals(defaultUser)) {
+            return true;
+        }
+
+        return false;
+    }
+
     public boolean isLoggedIn() {
         return state == LoginState.LOGGED_IN || isLoggingOut();
     }

diff --git a/app/src/main/java/fi/aalto/legroup/achso/browsing/BrowserActivity.java b/app/src/main/java/fi/aalto/legroup/achso/browsing/BrowserActivity.java
@@ -523,12 +523,6 @@ public void onVideoCreationState(VideoCreatorService.VideoCreationStateEvent eve
                 if (fragment != null) {
                     manager.beginTransaction().remove(fragment).commit();
                 }
-
-                UUID id = event.getId();
-                Intent infoIntent = new Intent(this, DetailActivity.class);
-                infoIntent.putExtra(DetailActivity.ARG_VIDEO_ID, id);
-                startActivity(infoIntent);
-
                 break;
 
             case ERROR:

diff --git a/app/src/main/java/fi/aalto/legroup/achso/browsing/DetailActivity.java b/app/src/main/java/fi/aalto/legroup/achso/browsing/DetailActivity.java
@@ -156,7 +156,6 @@ public void onCreate(Bundle savedInstanceState) {
         initializeIsLocal();
 
         if (!App.videoRepository.isAuthorizedToShareVideo(video.getId())) {
-            System.out.println("not authorized!");
             isPublicCheckbox.setEnabled(false);
             groupsButton.setEnabled(false);
             SnackbarManager.show(Snackbar.with(DetailActivity.this).text("You do not have the rights to share this video!"));
@@ -302,6 +301,16 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
     }
 
     private void initializeUploadButton() {
+        if (!App.loginManager.isLoggedIn()) {
+            String loginPrompt = getString(R.string.login_before_upload);
+
+            uploadButton.setEnabled(false);
+            uploadButton.setAlpha(.5f);
+            uploadButton.setText(loginPrompt);
+
+            return;
+        }
+
         if (!video.isLocal()) {
             uploadButton.setEnabled(false);
             uploadButton.setVisibility(View.GONE);
@@ -316,6 +325,12 @@ public void onClick(View view) {
                     uploadButton.setAlpha(.5f);
                     uploadButton.setText(currentlyUploading);
 
+                    // Set author to currently logged in user
+                    if (App.loginManager.isDefaultUser(video.getAuthor())) {
+                        video.setAuthor(App.loginManager.getUser());
+                        video.save(null);
+                    }
+
                     UUID id = video.getId();
                     UploadService.upload(DetailActivity.this, id);
                 }

diff --git a/app/src/main/java/fi/aalto/legroup/achso/storage/CombinedVideoRepository.java b/app/src/main/java/fi/aalto/legroup/achso/storage/CombinedVideoRepository.java
@@ -753,6 +753,11 @@ public boolean isAuthorizedToShareVideo(UUID id) {
         currentUser = App.loginManager.getUser();
         author = UserPool.getInternedUser(video.getAuthorUserIndex());
 
+        // Allow anybody to manipulate videos made by the default user
+        if (App.loginManager.isDefaultUser(author)) {
+            return true;
+        }
+
         if (currentUser.equals(author)) {
             return true;
         }

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -135,5 +135,6 @@
     <string name="qr_tag_fail">Etikettieren Video mit QR fehlgeschlagen!</string>
     <string name="qr_tag_success">Video markiert mit QR-Code</string>
     <string name="add_qr">In QR</string>
+    <string name="login_before_upload">Melden Sie sich vor dem Hochladen an</string>
 
 </resources>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
@@ -131,5 +131,6 @@
  <string name="qr_tag_fail">Sildi video QR ebaõnnestus!</string>
  <string name="qr_tag_success">Video sildistatud QR koodi</string>
  <string name="add_qr">Lisa QR</string>
+ <string name="login_before_upload">Logi sisse enne üleslaadimist</string>
 
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
@@ -162,4 +162,5 @@
     <string name="qr_tag_fail">QR-koodin lisäys videoon epäonnistuo</string>
     <string name="qr_tag_success">QR-koodin lisäys videoon onnistui</string>
     <string name="add_qr">Lisää QR</string>
+    <string name="login_before_upload">Kirjaudu sisään ennen lähetystä</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -185,5 +185,6 @@
     <string name="qr_tag_success">Video tagged with QR code</string>
     <string name="qr_tag_fail">Tagging video with QR failed!</string>
     <string name="add_qr">Add QR</string>
+    <string name="login_before_upload">Log in before uploading</string>
 
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files