DT @14.02.2016: 2.0.3 release

app/app.iml

@@ -68,6 +68,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes-proguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
@@ -88,14 +89,15 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-plus/8.4.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.maps.android/android-maps-utils/0.4/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mikepenz/google-material-typeface/2.1.0.1.original/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mikepenz/iconics-core/2.5.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mikepenz/iconics-core/2.5.5/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mikepenz/materialdrawer/4.5.8/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mikepenz/materialdrawer/4.6.4/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mikepenz/materialize/0.5.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.twitter.sdk.android/twitter-core/1.4.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/io.fabric.sdk.android/fabric/1.3.4/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/release" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
@@ -108,13 +110,13 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="play-services-base-8.4.0" level="project" />
     <orderEntry type="library" exported="" name="design-23.1.1" level="project" />
+    <orderEntry type="library" exported="" name="materialdrawer-4.6.4" level="project" />
     <orderEntry type="library" exported="" name="materialize-0.5.1" level="project" />
     <orderEntry type="library" exported="" name="facebook-android-sdk-4.8.1" level="project" />
     <orderEntry type="library" exported="" name="multidex-1.0.1" level="project" />
     <orderEntry type="library" exported="" name="androidbootstrap-2.0.1" level="project" />
     <orderEntry type="library" exported="" name="retrofit-1.6.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
-    <orderEntry type="library" exported="" name="materialdrawer-4.5.8" level="project" />
     <orderEntry type="library" exported="" name="library-1.0.19" level="project" />
     <orderEntry type="library" exported="" name="play-services-location-8.4.0" level="project" />
     <orderEntry type="library" exported="" name="fabric-1.3.4" level="project" />
@@ -129,8 +131,8 @@
     <orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="play-services-gcm-8.4.0" level="project" />
+    <orderEntry type="library" exported="" name="iconics-core-2.5.5" level="project" />
     <orderEntry type="library" exported="" name="play-services-plus-8.4.0" level="project" />
-    <orderEntry type="library" exported="" name="iconics-core-2.5.1" level="project" />
     <orderEntry type="library" exported="" name="gson-2.4" level="project" />
     <orderEntry type="library" exported="" name="play-services-measurement-8.4.0" level="project" />
   </component>

app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "org.deke.risk.riskahead"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 29
+        versionCode 31
-        versionName "2.0.1"
+        versionName "2.0.3"
     }
     buildTypes {
         release {

app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java

@@ -1,10 +1,13 @@
 package org.deke.risk.riskahead;
 
+import android.Manifest;
 import android.app.AlertDialog;
+import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.provider.MediaStore;
+import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.FragmentTransaction;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -26,6 +29,8 @@ import com.android.volley.toolbox.StringRequest;
 import com.beardedhen.androidbootstrap.BootstrapButton;
 import com.beardedhen.androidbootstrap.api.defaults.DefaultBootstrapBrand;
 import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.plus.Plus;
+import com.google.android.gms.plus.model.people.Person;
 import com.google.gson.Gson;
 
 import org.deke.risk.riskahead.fragment.BaseReportWFFragment;
@@ -65,6 +70,7 @@ public class ReportWFActivity extends BaseActivity implements ReportWF_1_Fragmen
                                                                 ,ReportWF_7_Fragment.OnInputFinishedListener, ReportWF_8_Fragment.OnInputFinishedListener, ReportWF_Finish_Fragment.SendReportListener {
 
     private final static String TAG = ReportWFActivity.class.getSimpleName();
+    private static final int MY_PERMISSIONS_REQUEST_STORAGE = 42;
 
     private List<BaseReportWFFragment> fragList = new ArrayList<>();
 
@@ -384,7 +390,36 @@ public class ReportWFActivity extends BaseActivity implements ReportWF_1_Fragmen
     }
 
     private void showDialogWhenReportAdded(final IncidentReport incident) {
+        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(this, new String[]{android.Manifest.permission.WRITE_EXTERNAL_STORAGE}, MY_PERMISSIONS_REQUEST_STORAGE);
+            return;
+        }else{
+            showShareDialog(incident);
+        }
+    }
 
+    @Override
+    public void onRequestPermissionsResult(int requestCode,
+                                           String permissions[], int[] grantResults) {
+        switch (requestCode) {
+            case MY_PERMISSIONS_REQUEST_STORAGE: {
+                // If request is cancelled, the result arrays are empty.
+                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+
+                    showShareDialog(incident);
+
+                } else {
+                    finishReportAndGotoMap(incident);
+                }
+                return;
+            }
+
+            // other 'case' lines to check for other
+            // permissions this app might request
+        }
+    }
+
+    private void showShareDialog(final IncidentReport incident) {
         new AlertDialog.Builder(ReportWFActivity.this)
                 .setTitle(R.string.txt_share_title)
                 .setMessage(R.string.txt_share_message)
@@ -392,7 +427,11 @@ public class ReportWFActivity extends BaseActivity implements ReportWF_1_Fragmen
                     public void onClick(DialogInterface dialog, int which) {
                         resetStateAndIncident();
                         gotoMapActivity(incident.getPosition().latitude + ":" + incident.getPosition().longitude);
+
+
                         startShareIncidentIntent(incident);
+
+
                     }
                 })
                 .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
@@ -402,7 +441,6 @@ public class ReportWFActivity extends BaseActivity implements ReportWF_1_Fragmen
                 })
                 .setIcon(android.R.drawable.ic_dialog_alert)
                 .show();
-
     }
 
     private void startShareIncidentIntent(IncidentReport incident) {

app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java

@@ -79,6 +79,8 @@ public class SubscriptionsActivity extends BaseActivity{
         tblBillings = (TableLayout) findViewById(R.id.tbl_billing);
         handler = new Handler();
 
+
+
             Thread thread = new Thread() {
                 @Override
                 public void run() {
@@ -94,7 +96,7 @@ public class SubscriptionsActivity extends BaseActivity{
                         public void onServiceConnected(ComponentName name,
                                                        IBinder service) {
                             mService = IInAppBillingService.Stub.asInterface(service);
-                        Log.d(TAG,"Connected to InApp Billing Service");
+                            Log.d(TAG, "Connected to InApp Billing Service");
 
                             initBillingOptions();
                             getAlreadyPurchasedItems();
@@ -112,6 +114,7 @@ public class SubscriptionsActivity extends BaseActivity{
             };
 
             thread.start();
+
     }
 
     private void getAlreadyPurchasedItems() {

app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java

@@ -15,7 +15,6 @@ import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.drawable.ColorDrawable;
-import android.location.LocationManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
@@ -46,8 +45,6 @@ import com.android.volley.toolbox.StringRequest;
 import com.google.android.gms.ads.AdListener;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.InterstitialAd;
-import com.google.android.gms.plus.Plus;
-import com.google.android.gms.plus.model.people.Person;
 import com.mikepenz.google_material_typeface_library.GoogleMaterial;
 import com.mikepenz.materialdrawer.AccountHeader;
 import com.mikepenz.materialdrawer.AccountHeaderBuilder;
@@ -140,16 +137,13 @@ public abstract class BaseActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        //overridePendingTransition(R.anim.fade_in_anim, R.anim.fade_out_anim);
-        //overridePendingTransition(android.R.anim.slide_in_left, android.R.anim.slide_out_right);
-
 
         onStartCount = 1;
-        if (savedInstanceState == null) // 1st time
+        if (savedInstanceState == null)
         {
             this.overridePendingTransition(R.anim.slide_in_left,
                     R.anim.slide_out_left);
-        } else // already created so reverse animation
+        } else
         {
             onStartCount = 2;
         }