Merge pull request #107 from RocketChat/fix/external-storage-permission

Ask for permission

app/build.gradle

@@ -123,6 +123,9 @@ dependencies {
 
     compile 'frankiesardo:icepick:3.2.0'
     provided 'frankiesardo:icepick-processor:3.2.0'
+
+    compile 'com.github.hotchemi:permissionsdispatcher:2.3.0'
+    annotationProcessor 'com.github.hotchemi:permissionsdispatcher-processor:2.3.0'
 }
 
 apply plugin: 'com.google.gms.google-services'

app/src/main/AndroidManifest.xml

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="chat.rocket.android">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
             android:name=".RocketChatApplication"
@@ -16,23 +17,23 @@
                 android:name=".activity.MainActivity"
                 android:windowSoftInputMode="adjustResize">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
         <activity
                 android:name=".activity.AddServerActivity"
-                android:windowSoftInputMode="adjustResize"/>
+                android:windowSoftInputMode="adjustResize" />
         <activity
                 android:name=".activity.ServerConfigActivity"
-                android:windowSoftInputMode="adjustResize"/>
+                android:windowSoftInputMode="adjustResize" />
 
-        <service android:name=".service.RocketChatService"/>
+        <service android:name=".service.RocketChatService" />
 
-        <service android:name=".service.notification.NotificationDismissalCallbackService"/>
+        <service android:name=".service.notification.NotificationDismissalCallbackService" />
     </application>
 
 </manifest>

app/src/main/java/chat/rocket/android/fragment/chatroom/RoomFragment.java

 package chat.rocket.android.fragment.chatroom;
 
+import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
@@ -31,6 +33,7 @@ import chat.rocket.android.layouthelper.chatroom.MessageComposerManager;
 import chat.rocket.android.layouthelper.chatroom.MessageListAdapter;
 import chat.rocket.android.layouthelper.chatroom.PairedMessage;
 import chat.rocket.android.log.RCLog;
+import chat.rocket.android.message.AbstractMessageSpec;
 import chat.rocket.android.message.AudioUploadMessageSpec;
 import chat.rocket.android.message.AbstractUploadMessageSpec;
 import chat.rocket.android.message.ImageUploadMessageSpec;
@@ -48,10 +51,13 @@ import chat.rocket.android.realm_helper.RealmObjectObserver;
 import chat.rocket.android.realm_helper.RealmStore;
 import chat.rocket.android.service.RocketChatService;
 import chat.rocket.android.widget.message.MessageComposer;
+import permissions.dispatcher.NeedsPermission;
+import permissions.dispatcher.RuntimePermissions;
 
 /**
  * Chat room screen.
  */
+@RuntimePermissions
 public class RoomFragment extends AbstractChatRoomFragment
     implements OnBackPressListener, RealmModelListAdapter.OnItemClickListener<PairedMessage> {
 
@@ -67,7 +73,8 @@ public class RoomFragment extends AbstractChatRoomFragment
   private MessageComposerManager messageComposerManager;
 
   private MessageSelectionDialogFragment.ClickListener messageSelectionClickListener =
-      messageSpec -> messageSpec.onSelect(RoomFragment.this);
+      messageSpec -> RoomFragmentPermissionsDispatcher
+          .onMessageSpecSelectedWithCheck(RoomFragment.this, messageSpec);
 
   public RoomFragment() {
   }
@@ -365,4 +372,16 @@ public class RoomFragment extends AbstractChatRoomFragment
   public boolean onBackPressed() {
     return closeSideMenuIfNeeded();
   }
+
+  @Override
+  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
+                                         @NonNull int[] grantResults) {
+    super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+    RoomFragmentPermissionsDispatcher.onRequestPermissionsResult(this, requestCode, grantResults);
+  }
+
+  @NeedsPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
+  protected void onMessageSpecSelected(AbstractMessageSpec messageSpec) {
+    messageSpec.onSelect(RoomFragment.this);
+  }
 }