Clean some code

.gitignore

@@ -14,3 +14,5 @@
 /tmp
 
 ktlint
+.idea/copyright/New_vector.xml
+.idea/copyright/profiles_settings.xml

CHANGES.md

@@ -8,7 +8,8 @@ Improvements:
  - Persist active tab between sessions (#503)
  - Do not upload file too big for the homeserver (#587)
  - Handle read markers (#84)
- - Attachments: start using system pickers
+ - Attachments: start using system pickers (#52)
+ - Attachments: start handling incoming share (#58)
 
 Other changes:
  - Accessibility improvements to read receipts in the room timeline and reactions emoji chooser

vector/src/main/AndroidManifest.xml

@@ -80,18 +80,18 @@
             </intent-filter>
         </activity>
 
-        <activity
+        <activity android:name=".features.share.IncomingShareActivity">
-            android:name=".features.share.IncomingShareActivity"
-            android:screenOrientation="portrait">
             <intent-filter>
-                <action android:name="android.intent.action.SEND"/>
+                <action android:name="android.intent.action.SEND" />
-                <data android:mimeType="*/*"/>
+                <data android:mimeType="*/*" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.OPENABLE" />
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.SEND_MULTIPLE"/>
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
-                <data android:mimeType="*/*"/>
+                <data android:mimeType="*/*" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.OPENABLE" />
             </intent-filter>

vector/src/main/java/im/vector/riotx/ActiveSessionObservableStore.kt

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 package im.vector.riotx
 
 import arrow.core.Option

vector/src/main/java/im/vector/riotx/features/attachments/ContactAttachment.kt

@@ -28,10 +28,11 @@ data class ContactAttachment(
 ) {
 
     fun toHumanReadable(): String {
-        val stringBuilder = StringBuilder(displayName)
+        return buildString {
-        phones.concatIn(stringBuilder)
+            append(displayName)
-        emails.concatIn(stringBuilder)
+            phones.concatIn(this)
-        return stringBuilder.toString()
+            emails.concatIn(this)
+        }
     }
 
     private fun List<String>.concatIn(stringBuilder: StringBuilder) {

vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt

@@ -1126,6 +1126,7 @@ class RoomDetailFragment :
     }
 
     override fun onContactAttachmentReady(contactAttachment: ContactAttachment) {
+        super.onContactAttachmentReady(contactAttachment)
         val formattedContact = contactAttachment.toHumanReadable()
         roomDetailViewModel.process(RoomDetailActions.SendMessage(formattedContact, false))
     }

vector/src/main/java/im/vector/riotx/features/share/IncomingShareActivity.kt

@@ -69,10 +69,10 @@ class IncomingShareActivity :
                 isShareManaged = handleTextShare(intent)
             }
             if (!isShareManaged) {
-                cannottManageShare()
+                cannotManageShare()
             }
         } else {
-            cannottManageShare()
+            cannotManageShare()
         }
     }
 
@@ -83,10 +83,10 @@ class IncomingShareActivity :
     }
 
     override fun onAttachmentsProcessFailed() {
-        cannottManageShare()
+        cannotManageShare()
     }
 
-    private fun cannottManageShare() {
+    private fun cannotManageShare() {
         Toast.makeText(this, R.string.error_handling_incoming_share, Toast.LENGTH_LONG).show()
         finish()
     }

vector/src/main/res/xml/riotx_provider_paths.xml

@@ -3,9 +3,4 @@
     <cache-path
         name="shared"
         path="/" />
-
-    <external-path
-        name="external_files"
-        path="." />
-
 </paths>