Merge branch 'master' into FDroid

.travis.yml

@@ -17,7 +17,8 @@ android:
     - tools
 
     # values in gradle.properties and .travis must be the same
-    - build-tools-24.0.2
+    # - build-tools-24.0.2
+    - build-tools-25.0.2
     - android-23
 
     - add-on

README.md

@@ -7,16 +7,16 @@ find, sort, view, copy, delete, set gps exif data, send, ... .
 
 * sizeof com.PlayZone.quickimagegallery.apk version 0.5.5: 2.7 MB
 * sizeof de.k3b.android.androFotoFinder.apk version 0.5.5: 1.7 MB 
-
-
+* sizeof de.k3b.android.androFotoFinder.apk version 0.6.0: 1.1 MB (better compression)
+* sizeof de.k3b.android.androFotoFinder.apk version 0.6.1: 1.3 MB (more translations)
 
 ## Features
 
 * Free, opensource, no adds, no user tracking, available on [f-droid](https://f-droid.org/)
 * Geotagging: Shows photos in a [geographic map](https://github.com/k3b/APhotoManager/wiki/geographic-map) from [openstreetmap](http://www.openstreetmap.org)
 * Buildin file manager for photos: find, sort, view, copy, delete, Show in map, set gps exif data, send, ... .
 * Fast [find](https://github.com/k3b/APhotoManager/wiki/Filter-View) local photos by (sub-)folder, date, [geographic map](https://github.com/k3b/APhotoManager/wiki/geographic-map)or [tags (keywords)](https://github.com/k3b/APhotoManager/wiki/Tags).
-* [Translations](https://crowdin.com/project/AndroFotoFinder): &nbsp;ar,&nbsp;<a href="https://github.com/k3b/APhotoManager/wiki/de-home">de</a>,&nbsp;<a href="https://github.com/k3b/APhotoManager/wiki/home"   >en</a>,&nbsp;<a href="https://github.com/k3b/APhotoManager/wiki/it-home">it</a>,&nbsp;<a href="https://github.com/k3b/APhotoManager/wiki/fr-home">fr</a>,&nbsp;<a href="https://github.com/k3b/APhotoManager/wiki/ja-home">ja</a>,&nbsp;nl,&nbsp;pl,&nbsp;<a href="https://github.com/k3b/APhotoManager/wiki/ro-home">ro</a>,&nbsp;ru&nbsp;<a href="https://github.com/k3b/APhotoManager/wiki/tr-home">tr</a>
+* [Translations](https://crowdin.com/project/AndroFotoFinder): &nbsp;ar,&nbsp;<a href="https://github.com/k3b/APhotoManager/wiki/de-home">de</a>,&nbsp;<a href="https://github.com/k3b/APhotoManager/wiki/home"   >en</a>,&nbsp;<a href="https://github.com/k3b/APhotoManager/wiki/it-home">it</a>,&nbsp;<a href="https://github.com/k3b/APhotoManager/wiki/fr-home">fr</a>,&nbsp;<a href="https://github.com/k3b/APhotoManager/wiki/ja-home">ja</a>,&nbsp;nl,&nbsp;pl,&nbsp;<a href="https://github.com/k3b/APhotoManager/wiki/ro-home">ro</a>,&nbsp;ru&nbsp;<a href="https://github.com/k3b/APhotoManager/wiki/tr-home">tr</a>,&nbsp;<a href="https://github.com/k3b/APhotoManager/wiki/zh-CN-home">zh-CN</a>,&nbsp;<a href="https://github.com/k3b/APhotoManager/wiki/zh-TW-home">zh-TW</a>
 	* [![Crowdin](https://d322cqt584bo4o.cloudfront.net/androFotoFinder/localized.svg)](https://crowdin.com/project/androFotoFinder)<a href="https://github.com/k3b/APhotoManager/issues/21">Help us to translate into other languages.</a>
 
 ---
@@ -44,6 +44,7 @@ find, sort, view, copy, delete, set gps exif data, send, ... .
 * [Gallery-View](https://github.com/k3b/APhotoManager/wiki/Gallery-View)
 * [Geographic-Map](https://github.com/k3b/APhotoManager/wiki/geographic-map)
 * [Image-View](https://github.com/k3b/APhotoManager/wiki/Image-View)
+* [Edit Exif infos](Exif-Edit) of photo(s)
 * [Filter-View](https://github.com/k3b/APhotoManager/wiki/Filter-View)
 * [tags (keywords)](https://github.com/k3b/APhotoManager/wiki/Tags)
 * [Bookmarks](https://github.com/k3b/APhotoManager/wiki/Bookmarks)

app/build.gradle

@@ -40,8 +40,8 @@ android {
         // 0.6.0.170421 (29)    bugfix Map
         // 0.6.0.170502 (30)    workaround "android stock icon as activity icon breaks aapt check in frdoid build"
 
-        versionCode = 30
-        versionName = '0.6.0.170502'
+        versionCode = 31
+        versionName = '0.6.1.170803'
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
@@ -97,11 +97,16 @@ dependencies {
     // compile 'com.android.support:appcompat-v7:21.0.2'
     // exif support
     // https://github.com/drewnoakes/metadata-extractor/wiki/GettingStarted licence: http://www.apache.org/licenses/LICENSE-2.0
-    compile 'com.drewnoakes:metadata-extractor:2.8.1'
+    // 2.10.1 includes more recent xmpcore that generates java-8 bytecode not supported by android yet
+    compile ('com.drewnoakes:metadata-extractor:2.10.1') { transitive = false; } // 2.8.1
 
 	// compile 'com.adobe.xmp:xmpcore:6.1.10' // update for drewnoakes:metadata-extractor requires java-8 compiler does not run on my android-4.4.
 	compile 'com.adobe.xmp:xmpcore:5.1.2' // current version for drewnoakes:metadata-extractor
 
+    // compile 'com.github.k3b:slideDateTimePicker:v1.0.5' // via jitpack.io
+
+    // compile 'org.apache.commons:commons-configuration2:2.1.1'
+
     // this is osmdroid
     compile 'org.osmdroid:osmdroid-android:5.4:release@aar'
     compile ('org.osmdroid:osmdroid-mapsforge:5.4:release@aar')

app/src/main/AndroidManifest.xml

@@ -173,6 +173,24 @@
             android:name=".GalleryFilterActivity"
             android:icon="@drawable/ic_action_search"
             android:label="@string/filter_menu_title" />
+        <activity
+            android:name=".ExifEditActivity"
+            android:icon="@drawable/exif_edit"
+            android:label="@string/exif_menu_title">
+        <!-- ImageDetail edit schema=file with mime=image/* -->
+            <intent-filter>
+                <action android:name="android.intent.action.EDIT" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <!-- file must have mimeType to match -->
+                <data
+                    android:mimeType="image/*"
+                    android:scheme="file" />
+            </intent-filter>
+        </activity>
+
         <activity
             android:name=".locationmap.GeoEditActivity"
             android:icon="@drawable/ic_geo_edit"

app/src/main/java/de/k3b/android/androFotoFinder/AndroFotoFinderApp.java

@@ -38,6 +38,8 @@
 import de.k3b.android.osmdroid.forge.MapsForgeSupport;
 import de.k3b.android.util.LogCat;
 import de.k3b.database.QueryParameter;
+import de.k3b.media.ExifInterface;
+import de.k3b.media.ImageMetaReader;
 import uk.co.senab.photoview.PhotoViewAttacher;
 import uk.co.senab.photoview.gestures.CupcakeGestureDetector;
 
@@ -71,6 +73,9 @@ public static RefWatcher getRefWatcher(Context context) {
 
         super.onCreate();
 
+        FotoLibGlobal.appName = getString(R.string.app_name);
+        FotoLibGlobal.appVersion = GuiUtil.getAppVersionName(this);
+
         Global.pickHistoryFile = getDatabasePath("pickHistory.geouri.txt");
         SettingsActivity.prefs2Global(this);
 
@@ -86,7 +91,8 @@ public static RefWatcher getRefWatcher(Context context) {
         Collections.addAll(QueryParameter.sParserDefaultSelect, FotoSql.DEFAULT_GALLERY_COLUMNS);
         mCrashSaveToFile = new LogCat(this, Global.LOG_CONTEXT, HugeImageLoader.LOG_TAG,
                 PhotoViewAttacher.LOG_TAG, CupcakeGestureDetector.LOG_TAG,
-                FotoLibGlobal.LOG_TAG, ThumbNailUtils.LOG_TAG, IMapView.LOGTAG);
+                FotoLibGlobal.LOG_TAG, ThumbNailUtils.LOG_TAG, IMapView.LOGTAG,
+                ExifInterface.LOG_TAG, ImageMetaReader.LOG_TAG);
 
         ThumbNailUtils.init(this, null);
 
@@ -97,6 +103,8 @@ public static RefWatcher getRefWatcher(Context context) {
         // #60: configure some of the mapsforge settings first
         MapsForgeSupport.createInstance(this);
 
+        FotoSql.deleteMediaWithNullPath(this);
+
         Log.i(Global.LOG_CONTEXT, getAppId() + " created");
     }