Merge pull request #3 from MrCsabaToth/master

Fixing #2 by asking for permission

Author: AlexeyBuzdin

src/main/java/com/github/androidify/PlaceholderFragment.java

@@ -1,12 +1,15 @@
 package com.github.androidify;
 
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
+import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -19,21 +22,26 @@ public class PlaceholderFragment extends Fragment {
     private final String mySound = "my_recorded_sound";
     private AndroidSoundRecorder soundRecorder;
     private AndroidSoundPlayer soundPlayer;
+    private ViewPager mViewPagerHead;
+    private ViewPager mViewPagerBody;
+    private ViewPager mViewPagerLegs;
+
+    private static final int WRITE_EXTERNAL_STORAGE = 1;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         final View rootView = inflater.inflate(R.layout.fragment_main, container, false);
-        final ViewPager viewPagerHead = (ViewPager) rootView.findViewById(R.id.viewPagerHead);
-        final ViewPager viewPagerBody = (ViewPager) rootView.findViewById(R.id.viewPagerBody);
-        final ViewPager viewPagerLegs = (ViewPager) rootView.findViewById(R.id.viewPagerLegs);
+        mViewPagerHead = (ViewPager) rootView.findViewById(R.id.viewPagerHead);
+        mViewPagerBody = (ViewPager) rootView.findViewById(R.id.viewPagerBody);
+        mViewPagerLegs = (ViewPager) rootView.findViewById(R.id.viewPagerLegs);
 
         FragmentManager fm = getActivity().getSupportFragmentManager();
-        viewPagerHead.setAdapter(new AndroidifyViewPagerAdapter(fm, AndroidDrawables.getHeads()));
-        viewPagerBody.setAdapter(new AndroidifyViewPagerAdapter(fm, AndroidDrawables.getBodies()));
-        viewPagerLegs.setAdapter(new AndroidifyViewPagerAdapter(fm, AndroidDrawables.getLegs()));
+        mViewPagerHead.setAdapter(new AndroidifyViewPagerAdapter(fm, AndroidDrawables.getHeads()));
+        mViewPagerBody.setAdapter(new AndroidifyViewPagerAdapter(fm, AndroidDrawables.getBodies()));
+        mViewPagerLegs.setAdapter(new AndroidifyViewPagerAdapter(fm, AndroidDrawables.getLegs()));
 
-        initShareButton(rootView, viewPagerHead, viewPagerBody, viewPagerLegs);
+        initShareButton(rootView);
         initPlayButton(rootView);
         initRecordButton(rootView);
 
@@ -81,29 +89,52 @@ public boolean onTouch(View view, MotionEvent motionEvent) {
         });
     }
 
-    private void initShareButton(View rootView, final ViewPager viewPagerHead, final ViewPager viewPagerBody, final ViewPager viewPagerLegs) {
+    private void initShareButton(View rootView) {
         View shareButton = rootView.findViewById(R.id.button_share);
         shareButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Integer head = AndroidDrawables.getHeads().get(viewPagerHead.getCurrentItem());
-                Integer body = AndroidDrawables.getBodies().get(viewPagerBody.getCurrentItem());
-                Integer legs = AndroidDrawables.getLegs().get(viewPagerLegs.getCurrentItem());
-
-                Bitmap bitmap = BitmapUtils.combineDrawables(getResources(), head, body, legs);
+                int permissionCheck = ContextCompat.checkSelfPermission(getActivity(),
+                        android.Manifest.permission.WRITE_EXTERNAL_STORAGE);
 
-                String imagePath = MediaStore.Images.Media.insertImage(getActivity().getContentResolver(), bitmap, "Android Avatar", null);
-                Uri imageURI = Uri.parse(imagePath);
-                startShareActivity(imageURI);
+                if (permissionCheck != PackageManager.PERMISSION_GRANTED) {
+                    requestPermissions(
+                            new String[] { android.Manifest.permission.WRITE_EXTERNAL_STORAGE },
+                            WRITE_EXTERNAL_STORAGE);
+                } else {
+                    share();
+                }
             }
         });
     }
 
     @Override
-    public void onPause() {
-        super.onPause();
-        soundRecorder.stopRecording();
-        soundPlayer.stopPlaying();
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        switch (requestCode) {
+
+            case WRITE_EXTERNAL_STORAGE:
+                if ((grantResults.length > 0) && (grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
+                    share();
+                }
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    private void share() {
+        Integer head = AndroidDrawables.getHeads().get(mViewPagerHead.getCurrentItem());
+        Integer body = AndroidDrawables.getBodies().get(mViewPagerBody.getCurrentItem());
+        Integer legs = AndroidDrawables.getLegs().get(mViewPagerLegs.getCurrentItem());
+
+        Bitmap bitmap = BitmapUtils.combineDrawables(getResources(), head, body, legs);
+
+        String imagePath = MediaStore.Images.Media.insertImage(
+                getActivity().getContentResolver(), bitmap,
+                getResources().getString(R.string.android_avatar), null);
+        Uri imageURI = Uri.parse(imagePath);
+        startShareActivity(imageURI);
     }
 
     private void startShareActivity(Uri imageURI) {
@@ -115,4 +146,11 @@ private void startShareActivity(Uri imageURI) {
 
         startActivity(shareIntent);
     }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        soundRecorder.stopRecording();
+        soundPlayer.stopPlaying();
+    }
 }

src/main/res/values/strings.xml

@@ -4,5 +4,6 @@
     <string name="app_name">My Module</string>
     <string name="action_settings">Settings</string>
     <string name="create_your_android">Create your Android</string>
+    <string name="android_avatar">Android Avatar</string>
 
 </resources>