* prepared for f-droid debut!

* changed license to GPLv3 * better handling of OpenCV Manager download
allgood · Feb 23, 2016 · b9f1ceb · b9f1ceb
1 parent 7ca91fb
commit b9f1ceb
Show file tree

Hide file tree

Showing 7 changed files with 731 additions and 363 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 Change Log
 ==========
 
+version 1.0.10 - a.k.a. f-droid debut
+-------------------------------------
+
+* removed unnecessary maven references
+* changed license to GPLv3
+* enhancements on downloading OpenCV binaries
+
+
 version 1.0.9
 -------------
 

diff --git a/GPLv2.TXT b/GPLv2.TXT
diff --git a/GPLv3.TXT b/GPLv3.TXT
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,7 +1,7 @@
 Copyright 2016 - Claudemir Todo Bom
 
-Software licensed under the GPL version 2 available in GPLv2.TXT and
-online on http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+Software licensed under the GPL version 3 available in GPLv3.TXT and
+online on http://www.gnu.org/licenses/gpl.txt.
 
 Use parts from other developers, sometimes with small changes,
 references on autorship and specific licenses are on individual

diff --git a/README.md b/README.md
@@ -18,13 +18,15 @@ Requirements
 
 Because of the version of OpenCV that is used in the project it needs to run on Android 5.0 (lollipop) or newer.
 
+In order to capture and manipulate images Open Note Scanner depends on having the OpenCV Manager application installed. If not installed Open Note Scanner will ask to download it from https://github.com/ctodobom/OpenCV-3.1.0-Android or from Google Play Store.
+
 
 How to Install
 --------------
 
 It is possible to install it directly from Google Play Store through [this link](https://play.google.com/store/apps/details?id=com.todobom.opennotescanner).
 
-Binary APK file is available in the [releases section](https://github.com/ctodobom/OpenNoteScanner/releases) of the project. If you install the binary manually you will need also the OpenCV Manager. The best way on doing this manually is downloading the [OpenCV SDK for Android](http://sourceforge.net/projects/opencvlibrary/files/opencv-android/3.1.0/OpenCV-3.1.0-android-sdk.zip/download) on a computer, unzip it and pick the correct APK for your device in the ```apk``` folder. Normally for phone devices, the armeabi-v7a is the correct one. If you have Play Store access, Open Note Scanner will direct you to it in order to download OpenCV Manager if it is not found in the device.
+Binary APK file is available in the [releases section](https://github.com/ctodobom/OpenNoteScanner/releases) of the project. 
 
 
 Instructions for building
@@ -101,8 +103,8 @@ License
 
 Copyright 2016 - Claudemir Todo Bom
 
-Software licensed under the GPL version 2 available in GPLv2.TXT and
-online on http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+Software licensed under the GPL version 2 available in GPLv3.TXT and
+online on http://www.gnu.org/licenses/gpl.txt.
 
 Use parts from other developers, sometimes with small changes,
 references on autorship and specific licenses are on individual

diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.todobom.opennotescanner"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 9
-        versionName '1.0.9'
+        versionCode 10
+        versionName '1.0.10'
     }
     buildTypes {
         release {
@@ -21,21 +21,14 @@ android {
 }
 
 repositories {
-    mavenCentral()
-    maven {
-        url 'https://raw.github.com/embarkmobile/zxing-android-minimal/mvn-repo/maven-repository/'
-    }
     maven { url "https://jitpack.io" }
-
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:23.1.1'
     compile 'com.android.support:design:23.1.1'
-    compile 'com.embarkmobile:zxing-android-minimal:2.0.0@aar'
-    compile 'com.embarkmobile:zxing-android-integration:2.0.0@aar'
     compile 'com.google.zxing:core:3.0.1'
     compile 'com.android.support:support-v4:23.1.1'
     compile 'com.github.ctodobom:OpenCV-3.1.0-Android:-SNAPSHOT'

diff --git a/app/src/main/java/com/todobom/opennotescanner/helpers/CustomOpenCVLoader.java b/app/src/main/java/com/todobom/opennotescanner/helpers/CustomOpenCVLoader.java
@@ -1,6 +1,7 @@
 package com.todobom.opennotescanner.helpers;
 
 import android.app.AlertDialog;
+import android.app.Dialog;
 import android.app.DownloadManager;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -40,6 +41,26 @@ public void onServiceDisconnected(ComponentName name) {
         }
     };
     private static long myDownloadReference;
+    private static LoaderCallbackInterface Callback;
+    private static String Version;
+
+
+    public static boolean isFDroidInstalled(Context context) {
+        PackageManager pm = context.getPackageManager();
+        boolean app_installed = false;
+        try
+        {
+            PackageInfo info = pm.getPackageInfo("org.fdroid.fdroid", PackageManager.GET_ACTIVITIES);
+            String label = (String) info.applicationInfo.loadLabel(pm);
+            app_installed = (label != null);
+        }
+        catch (PackageManager.NameNotFoundException e)
+        {
+            app_installed = false;
+        }
+        return app_installed;
+    }
+
 
 
     public static boolean isGooglePlayInstalled(Context context) {
@@ -112,6 +133,8 @@ public void onReceive(Context ctxt, Intent intent) {
                             intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
                             intent.setDataAndType(dm.getUriForDownloadedFile(id),
                                     dm.getMimeTypeForDownloadedFile(id));
+
+                            waitOpenCVDialog.dismiss();
                             AppContext.startActivity(intent);
                             AppContext.unregisterReceiver(onComplete);
                             break;
@@ -134,12 +157,17 @@ public void onReceive(Context ctxt, Intent intent) {
         }
     };
 
-    static AlertDialog.Builder cancelInstallOpenCV;
+    static AlertDialog.Builder waitInstallOpenCV;
+    static Dialog waitOpenCVDialog;
+
+
+    public static boolean initAsync(String version, final Context AppContext, LoaderCallbackInterface callback) {
 
-    public static boolean initAsync(String Version, final Context AppContext, LoaderCallbackInterface Callback) {
+        Version = version;
+        Callback = callback;
 
         // if don't have google play, check for OpenCV before trying to init
-        if (!isOpenCVInstalled(Version,AppContext) && !isGooglePlayInstalled(AppContext)) {
+        if (!isOpenCVInstalled(Version,AppContext) && ( isFDroidInstalled(AppContext) || !isGooglePlayInstalled(AppContext))) {
 
             AlertDialog.Builder askInstallOpenCV = new AlertDialog.Builder(AppContext);
 
@@ -165,13 +193,13 @@ public void onClick(DialogInterface dialog, int which) {
 
                     dialog.dismiss();
 
-                    cancelInstallOpenCV = new AlertDialog.Builder(AppContext);
+                    waitInstallOpenCV = new AlertDialog.Builder(AppContext);
 
-                    cancelInstallOpenCV.setTitle(AppContext.getString(R.string.downloading));
-                    cancelInstallOpenCV.setMessage(AppContext.getString(R.string.downloading_opencv));
+                    waitInstallOpenCV.setTitle(AppContext.getString(R.string.downloading));
+                    waitInstallOpenCV.setMessage(AppContext.getString(R.string.downloading_opencv));
 
-                    cancelInstallOpenCV.setCancelable(false);
-                    cancelInstallOpenCV.setOnCancelListener( new DialogInterface.OnCancelListener() {
+                    waitInstallOpenCV.setCancelable(false);
+                    waitInstallOpenCV.setOnCancelListener(new DialogInterface.OnCancelListener() {
 
                         @Override
                         public void onCancel(DialogInterface dialog) {
@@ -181,7 +209,7 @@ public void onCancel(DialogInterface dialog) {
                         }
                     });
 
-                    cancelInstallOpenCV.setNegativeButton(AppContext.getString(R.string.answer_cancel), new DialogInterface.OnClickListener() {
+                    waitInstallOpenCV.setNegativeButton(AppContext.getString(R.string.answer_cancel), new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             dm.remove(myDownloadReference);
@@ -190,7 +218,8 @@ public void onClick(DialogInterface dialog, int which) {
                         }
                     });
 
-                    cancelInstallOpenCV.create().show();
+                    waitOpenCVDialog = waitInstallOpenCV.create();
+                    waitOpenCVDialog.show();
 
                 }
 
@@ -201,6 +230,7 @@ public void onClick(DialogInterface dialog, int which) {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
                     dialog.dismiss();
+                    OpenCVLoader.initAsync(Version, AppContext, Callback);
                 }
             });