Merge pull request #80 from MobileApplicationsClub/fix-75

added worker for uploads

Author: Rushi98

androidClient/app/build.gradle

@@ -35,24 +35,24 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.0.0-rc01'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0-rc01'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
+    implementation 'androidx.appcompat:appcompat:1.0.0-rc02'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0-rc02'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.material:material:1.0.0-rc01'
     implementation 'pub.devrel:easypermissions:1.2.0'
     implementation('com.google.api-client:google-api-client-android:1.23.0') {
         exclude group: 'org.apache.httpcomponents'
     }
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.4'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'
     implementation('com.google.apis:google-api-services-drive:v3-rev117-1.23.0') {
         exclude group: 'org.apache.httpcomponents'
     }
-    implementation 'com.google.firebase:firebase-core:16.0.1'
+    implementation 'com.google.firebase:firebase-core:16.0.3'
     implementation 'com.google.firebase:firebase-database:16.0.1'
-    implementation 'com.google.firebase:firebase-auth:16.0.2'
-    implementation 'com.google.firebase:firebase-messaging:17.1.0'
+    implementation 'com.google.firebase:firebase-auth:16.0.3'
+    implementation 'com.google.firebase:firebase-messaging:17.3.0'
     implementation 'com.google.firebase:firebase-config:16.0.0'
-    implementation 'com.google.android.gms:play-services-auth:15.0.1'
+    implementation 'com.google.android.gms:play-services-auth:16.0.0'
     implementation 'com.facebook.fresco:fresco:1.10.0'
     implementation 'com.squareup.okhttp:okhttp:2.7.5'
     def lifecycle_version = "2.0.0-rc01"
@@ -73,6 +73,10 @@ dependencies {
     implementation 'com.github.chrisbanes:PhotoView:2.1.4'
     implementation 'com.squareup.picasso:picasso:2.71828'
     implementation 'com.github.apl-devs:appintro:v4.2.3'
+    def work_version = "1.0.0-alpha08"
+    implementation "android.arch.work:work-runtime:$work_version" // use -ktx for Kotlin
+    // optional - Firebase JobDispatcher support
+    implementation "android.arch.work:work-firebase:$work_version"
 }
 apply plugin: 'com.google.gms.google-services'
 repositories {

androidClient/app/src/main/AndroidManifest.xml

@@ -53,7 +53,6 @@
             android:enabled="true">
 
         </service>
-        <service android:name=".coursematerial.UploadService" />
 
         <activity
             android:name=".HomeActivity"
@@ -114,4 +113,4 @@
 
     </application>
 
-</manifest>
+</manifest>

androidClient/app/src/main/java/com/macbitsgoa/comrades/CHC.kt

@@ -15,7 +15,7 @@ const val TAG_PREFIX = "mac."
 const val BITS_EMAIL_SUFFIX = ".bits-pilani.ac.in"
 val firebaseRootRef: DatabaseReference = FirebaseDatabase.getInstance().reference
         .child(BuildConfig.BUILD_TYPE)
-
+val courseMaterialRef: DatabaseReference = firebaseRootRef.child(FB_NODE_COURSE_MATERIAL)
 /**
  * [ValueEventListener] logging the error and delegating the user to implement
  * only [ValueEventListener.onDataChange]

androidClient/app/src/main/java/com/macbitsgoa/comrades/FirebaseKeys.kt

@@ -13,6 +13,7 @@ const val TOPIC_COURSE_UPDATES = BuildConfig.BUILD_TYPE + "CourseUpdates"
 const val COURSES = "courses"
 const val CONTRIBUTORS = "contributors"
 const val CONTRIBUTORS_NAME = "name"
+const val FB_NODE_COURSE_MATERIAL = "courseMaterial"
 /**
  * Get fcm channel name corresponding to the course
  */

androidClient/app/src/main/java/com/macbitsgoa/comrades/coursematerial/CourseActivity.java

@@ -245,6 +245,13 @@ private void handleSort() {
                 }).show();
     }
 
+    private void removeObservers() {
+        materialVm.getMaterialListByFileType(courseId).removeObservers(this);
+        materialVm.getMaterialListByName(courseId).removeObservers(this);
+        materialVm.getMaterialListByTimestamp(courseId).removeObservers(this);
+        materialVm.getMaterialListBySize(courseId).removeObservers(this);
+    }
+
     @Override
     public void onSaveInstanceState(final Bundle savedInstanceState) {
         super.onSaveInstanceState(savedInstanceState);
@@ -332,7 +339,7 @@ public void onClick(final View view) {
     private void showFragment() {
         final FragmentManager fm = getSupportFragmentManager();
         final FragmentTransaction ft = fm.beginTransaction();
-        final DialogFragment uploadFileFragment = new UploadFileFragment();
+        final DialogFragment uploadFileFragment = new UploadFileFragment(courseId);
         uploadFileFragment.show(ft, ADD_FILE_FRAGMENT);
         ft.addToBackStack(ADD_FILE_FRAGMENT);
     }
@@ -410,11 +417,5 @@ public void onResume() {
                 .registerReceiver(broadcastReceiver, new IntentFilter(DownloadService.ACTION));
     }
 
-    private void removeObservers() {
-        materialVm.getMaterialListByFileType(courseId).removeObservers(this);
-        materialVm.getMaterialListByName(courseId).removeObservers(this);
-        materialVm.getMaterialListByTimestamp(courseId).removeObservers(this);
-        materialVm.getMaterialListBySize(courseId).removeObservers(this);
-    }
 }
 

androidClient/app/src/main/java/com/macbitsgoa/comrades/coursematerial/UploadFileFragment.java

@@ -18,12 +18,12 @@
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.Fragment;
 
 import static android.app.Activity.RESULT_CANCELED;
 import static android.app.Activity.RESULT_OK;
 import static com.macbitsgoa.comrades.CHCKt.TAG_PREFIX;
 import static com.macbitsgoa.comrades.GetGoogleSignInActivity.KEY_TOKEN;
+import static com.macbitsgoa.comrades.coursematerial.Uploader.upload;
 
 public class UploadFileFragment extends DialogFragment
         implements View.OnClickListener {
@@ -37,6 +37,11 @@ public class UploadFileFragment extends DialogFragment
     private FloatingActionButton fabAddImage;
     private TextView file;
     private String filePath;
+    private String courseId;
+
+    public UploadFileFragment(final String courseId) {
+        this.courseId = courseId;
+    }
 
     @Override
     public Dialog onCreateDialog(final Bundle savedInstanceState) {
@@ -57,8 +62,6 @@ public Dialog onCreateDialog(final Bundle savedInstanceState) {
                 .setNegativeButton(getString(R.string.cancel), (dialogInterface, i) -> {
                 })
                 .create();
-
-
     }
 
     /**
@@ -72,7 +75,6 @@ private void initUi(final View view) {
         fabAddImage = view.findViewById(R.id.fab_image);
         fileName = view.findViewById(R.id.et_file_name);
         file = view.findViewById(R.id.tv_file_path);
-
     }
 
     private void setPositiveClick() {
@@ -86,10 +88,8 @@ private void setPositiveClick() {
                 Toast.makeText(getContext(), R.string.warn_empty_file_name, Toast.LENGTH_LONG).show();
                 return;
             }
-            final Fragment dialogFragment = getActivity().getSupportFragmentManager()
-                    .findFragmentByTag(CourseActivity.ADD_FILE_FRAGMENT);
             final Intent signInIntent = new Intent(getActivity(), GetGoogleSignInActivity.class);
-            dialogFragment.startActivityForResult(signInIntent, SIGN_IN_REQUEST_CODE);
+            startActivityForResult(signInIntent, SIGN_IN_REQUEST_CODE);
         };
 
 
@@ -102,29 +102,27 @@ private void setPositiveClick() {
      */
     @Override
     public void onClick(final View view) {
-        final UploadFileFragment dialogFragment = (UploadFileFragment) getActivity().getSupportFragmentManager()
-                .findFragmentByTag(CourseActivity.ADD_FILE_FRAGMENT);
         switch (view.getId()) {
             case R.id.fab_image:
                 Intent imageIntent = new Intent();
                 imageIntent.setType("image/*");
                 imageIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, false);
                 imageIntent.setAction(Intent.ACTION_GET_CONTENT);
-                dialogFragment.startActivityForResult(Intent.createChooser(imageIntent, "Select Picture"), REQUEST_CHOOSER);
+                startActivityForResult(Intent.createChooser(imageIntent, "Select Picture"), REQUEST_CHOOSER);
                 break;
 
             case R.id.fab_doc:
                 Intent fileIntent = new Intent(Intent.ACTION_GET_CONTENT);
                 fileIntent.addCategory(Intent.CATEGORY_OPENABLE);
                 fileIntent.setType("application/pdf");
-                dialogFragment.startActivityForResult(Intent.createChooser(fileIntent, "Select Pdf"), REQUEST_CHOOSER);
+                startActivityForResult(Intent.createChooser(fileIntent, "Select Pdf"), REQUEST_CHOOSER);
                 break;
 
             case R.id.fab_all_files:
                 Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
                 intent.addCategory(Intent.CATEGORY_OPENABLE);
                 intent.setType("*/*");
-                dialogFragment.startActivityForResult(Intent.createChooser(intent, "Select File"), REQUEST_CHOOSER);
+                startActivityForResult(Intent.createChooser(intent, "Select File"), REQUEST_CHOOSER);
                 break;
             default:
                 if (BuildConfig.DEBUG) {
@@ -146,11 +144,7 @@ public void onActivityResult(final int requestCode, final int resultCode, final
 
         if (requestCode == SIGN_IN_REQUEST_CODE && resultCode == RESULT_OK) {
             final String accessToken = data.getStringExtra(KEY_TOKEN);
-            Intent uploadIntent = UploadService.makeUploadIntent(getContext(), filePath,
-                    accessToken, fileName.getText().toString());
-            Toast.makeText(getContext(), "Upload Started.Check NotificationBar for progress.",
-                    Toast.LENGTH_LONG).show();
-            getActivity().startService(uploadIntent);
+            upload(filePath, accessToken, fileName.getText().toString(), courseId);
         } else if (resultCode == RESULT_OK) {
             filePath = PathUtil.getPath(getContext(), data.getData());
             if (filePath != null) {
@@ -163,7 +157,5 @@ public void onActivityResult(final int requestCode, final int resultCode, final
         } else if (resultCode == RESULT_CANCELED) {
             Toast.makeText(getContext(), "No File Selected", Toast.LENGTH_LONG).show();
         }
-
     }
-
 }