From bd164ff83291c8b2829ec9551fac77d43a8e235b Mon Sep 17 00:00:00 2001
From: Mateusz Hinc <mateusz.hinc95@gmail.com>
Date: Sun, 12 Jan 2020 11:44:58 +0100
Subject: [PATCH] snapchat

---
 app/src/main/AndroidManifest.xml               |  2 +-
 .../activity/NewPostActivity.kt                | 18 +++++++++++-------
 .../socialplatforms/Snapchat.kt                |  4 ++++
 app/src/main/res/values/strings.xml            |  4 ++--
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 07a5330..d419ce5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,7 +77,7 @@
 <!--        <meta-data android:name="com.snapchat.kit.sdk.scopes" android:resource="@array/snap_connect_scopes" />-->
 
         <provider
-            android:authorities="${applicationId}.fileprovider,pl.edu.amu.wmi.socialaggregator.activity.NewPostActivity"
+            android:authorities="${applicationId}.fileprovider"
             android:name="androidx.core.content.FileProvider"
             android:exported="false"
             android:grantUriPermissions="true">
diff --git a/app/src/main/java/pl/edu/amu/wmi/socialaggregator/activity/NewPostActivity.kt b/app/src/main/java/pl/edu/amu/wmi/socialaggregator/activity/NewPostActivity.kt
index c5c85ca..6ff1176 100644
--- a/app/src/main/java/pl/edu/amu/wmi/socialaggregator/activity/NewPostActivity.kt
+++ b/app/src/main/java/pl/edu/amu/wmi/socialaggregator/activity/NewPostActivity.kt
@@ -16,6 +16,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.snackbar.Snackbar
 import com.jakewharton.rxbinding2.view.RxView
 import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.functions.BiFunction
 import io.reactivex.schedulers.Schedulers
 import io.reactivex.subjects.PublishSubject
@@ -75,12 +76,14 @@ class NewPostActivity : AppCompatActivity() {
             }
             .observeOn(Schedulers.io())
             .doOnNext {
-                resumedSubject.zipWith(
-                    Observable.fromIterable(availablesRecycler.chips.entries
-                        .filter { (_, chip) -> chip.isChecked }
-                        .map { it.key }),
-                    BiFunction<Any, SocialPlatform, SocialPlatform> { _, t2 -> t2 }
-                )
+                resumedSubject
+                    .zipWith(
+                        Observable.fromIterable(availablesRecycler.chips.entries
+                            .filter { (_, chip) -> chip.isChecked }
+                            .map { it.key }),
+                        BiFunction<Any, SocialPlatform, SocialPlatform> { _, t2 -> t2 }
+                    )
+                    .observeOn(Schedulers.io())
                     .doOnNext {
                         val bitmap = BitmapFactory.decodeFile(file!!)
                         it.addPost(
@@ -90,8 +93,9 @@ class NewPostActivity : AppCompatActivity() {
                             listOf(file!!)
                         )
                     }
-                    .take(availablesRecycler.chips.count { it.value.isChecked }.toLong())
+                    .take(availablesRecycler.chips.count { it.value.isChecked }.toLong() + 1)
                     .toList()
+                    .observeOn(AndroidSchedulers.mainThread())
                     .subscribe { _ ->
                         finish()
                     }
diff --git a/app/src/main/java/pl/edu/amu/wmi/socialaggregator/socialplatforms/Snapchat.kt b/app/src/main/java/pl/edu/amu/wmi/socialaggregator/socialplatforms/Snapchat.kt
index 8d22a9c..b2c3c5c 100644
--- a/app/src/main/java/pl/edu/amu/wmi/socialaggregator/socialplatforms/Snapchat.kt
+++ b/app/src/main/java/pl/edu/amu/wmi/socialaggregator/socialplatforms/Snapchat.kt
@@ -47,6 +47,10 @@ class Snapchat : SocialPlatform {
             SnapPhotoContent(photoFile!!)
         }.first()
 
+        if (text.isNotBlank()) {
+            content.captionText = text
+        }
+
         snapCreativeKitApi.sendWithCompletionHandler(
             content,
             object : SnapCreativeKitCompletionCallback {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cd531cb..6ba285a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,8 +1,8 @@
 <resources>
     <string name="app_name">Social Aggregator</string>
-    <string name="title_activity_new_post">NewPostActivity</string>
+    <string name="title_activity_new_post">Create new post!</string>
     <string name="title_activity_add_social">AddSocialActivity</string>
-    <string name="title_activity_post_history">PostHistoryActivity</string>
+    <string name="title_activity_post_history">Posts history</string>
 
     <string name="facebook_app_id">2437098899888167</string>
     <string name="fb_login_protocol_scheme">fb2437098899888167</string>