* piwiki usage stats

Author: allgood

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.todobom.opennotescanner"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 20
-        versionName '1.0.20'
+        versionCode 21
+        versionName '1.0.21'
     }
     buildTypes {
         release {
@@ -17,6 +17,10 @@ android {
         }
     }
     productFlavors {
+        fdroid {
+        }
+        gplay {
+        }
     }
 }
 

app/src/main/AndroidManifest.xml

@@ -55,10 +55,11 @@
         </activity>
         <activity
             android:name=".FullScreenViewActivity"
-            android:theme="@style/FullscreenTheme"></activity>
-        <activity android:name=".SettingsActivity"
-            android:theme="@style/AppTheme"
-            android:label="@string/settings"></activity>
+            android:theme="@style/FullscreenTheme" />
+        <activity
+            android:name=".SettingsActivity"
+            android:label="@string/settings"
+            android:theme="@style/AppTheme" />
     </application>
 
 </manifest>

app/src/main/java/com/todobom/opennotescanner/OpenNoteScannerActivity.java

@@ -194,8 +194,6 @@ public void onClick(View view) {
             }
         });
 
-        checkCreatePermissions();
-
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
         Display display = getWindowManager().getDefaultDisplay();
@@ -496,6 +494,8 @@ public void onResume() {
             Log.d(TAG,"myBuild "+ build);
         }
 
+        checkCreatePermissions();
+
         CustomOpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_3_1_0, this, mLoaderCallback);
 
         if (mImageThread == null ) {
@@ -1073,19 +1073,24 @@ private void statsOptInDialog() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 mSharedPref.edit().putBoolean("usage_stats",true);
+                mSharedPref.edit().putBoolean("isFirstRun",false);
+                dialog.dismiss();
             }
         });
 
         statsOptInDialog.setNegativeButton(R.string.answer_no, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 mSharedPref.edit().putBoolean("usage_stats",false);
+                mSharedPref.edit().putBoolean("isFirstRun",false);
+                dialog.dismiss();
             }
         });
 
         statsOptInDialog.setNeutralButton(R.string.answer_later, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
+                dialog.dismiss();
             }
         });
 

app/src/main/java/com/todobom/opennotescanner/OpenNoteScannerApplication.java

@@ -20,6 +20,11 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
             if (key.equals("usage_stats")) {
                 mOptOut = !sharedPreferences.getBoolean("usage_stats", false);
                 getPiwik().setOptOut(mOptOut);
+
+                // when user opt-in, register the download
+                if (!mOptOut) {
+                    getTracker().trackAppDownload(OpenNoteScannerApplication.this, Tracker.ExtraIdentifier.APK_CHECKSUM);
+                }
             }
         }
     };
@@ -44,6 +49,12 @@ public void onCreate() {
     private void initPiwik() {
         mSharedPref = PreferenceManager.getDefaultSharedPreferences(this);
 
+        // enable usage stats on google play
+        if (BuildConfig.FLAVOR.equals("gplay") && mSharedPref.getBoolean("isFirstRun",true)) {
+            mSharedPref.edit().putBoolean("usage_stats", true);
+            mSharedPref.edit().putBoolean("isFirstRun", false);
+        }
+
         // usage stats is optional and only when not debugging
         mOptOut = !mSharedPref.getBoolean("usage_stats", false);
         getPiwik().setOptOut(mOptOut);

app/src/main/java/com/todobom/opennotescanner/helpers/CustomOpenCVLoader.java

@@ -43,6 +43,7 @@ public void onServiceDisconnected(ComponentName name) {
     private static long myDownloadReference;
     private static LoaderCallbackInterface Callback;
     private static String Version;
+    private static AlertDialog mAskInstallDialog;
 
 
     public static boolean isFDroidInstalled(Context context) {
@@ -167,6 +168,12 @@ public static boolean initAsync(String version, final Context AppContext, Loader
         Version = version;
         Callback = callback;
 
+        // if dialog is showing, remove
+        if (mAskInstallDialog != null) {
+            mAskInstallDialog.dismiss();
+            mAskInstallDialog = null;
+        }
+
         // if don't have google play, check for OpenCV before trying to init
         if (!isOpenCVInstalled(Version,AppContext) && ( isFDroidInstalled(AppContext) || !isGooglePlayInstalled(AppContext))) {
 
@@ -207,6 +214,7 @@ public void onCancel(DialogInterface dialog) {
                             dm.remove(myDownloadReference);
                             AppContext.unregisterReceiver(onComplete);
                             dialog.dismiss();
+                            mAskInstallDialog = null;
                         }
                     });
 
@@ -216,6 +224,7 @@ public void onClick(DialogInterface dialog, int which) {
                             dm.remove(myDownloadReference);
                             AppContext.unregisterReceiver(onComplete);
                             dialog.dismiss();
+                            mAskInstallDialog = null;
                         }
                     });
 
@@ -235,12 +244,14 @@ public void onClick(DialogInterface dialog, int which) {
                 }
             });
 
-            askInstallOpenCV.create().show();
+            mAskInstallDialog = askInstallOpenCV.create();
+
+            mAskInstallDialog.show();
 
         } else {
             // initialize opencv
             return OpenCVLoader.initAsync(Version, AppContext, Callback);
-        };
+        }
 
         return false;