Merge branch 'simplegallery' into 'master'

SimpleGallery - update

See merge request fdroid/fdroiddata!6407

metadata/com.simplemobiletools.gallery.pro.yml

@@ -403,12 +403,17 @@ Builds:
       - yes
     prebuild: sed -i -e '/keystore/d' build.gradle
 
-MaintainerNotes: Includes proprietary PhotoEditor SDK (ly.img.android.pesdk) since
-    6.11.0.
+  - versionName: 6.13.1-foss
+    versionCode: 296
+    commit: 86d26f69fc4f405b28fa16b8e6d5de9edcd24830
+    subdir: app
+    patch:
+      - build.patch
+    gradle:
+      - foss
+    prebuild: sed -i -e '/(is_proprietary)/,+2d' ../build.gradle
 
 AutoUpdateMode: None
 UpdateCheckMode: Tags
-CurrentVersion: 6.12.5
-CurrentVersionCode: 294
-
-NoSourceSince: 6.11.0
+CurrentVersion: 6.13.1-foss
+CurrentVersionCode: 296

metadata/com.simplemobiletools.gallery.pro/build.patch

@@ -0,0 +1,56 @@
+--- a/app/build.gradle
++++ b/app/build.gradle
+@@ -3,12 +3,6 @@
+ apply plugin: 'kotlin-android-extensions'
+ apply plugin: 'kotlin-kapt'
+ 
+-def keystorePropertiesFile = rootProject.file("keystore.properties")
+-def keystoreProperties = new Properties()
+-if (keystorePropertiesFile.exists()) {
+-    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+-}
+-
+ android {
+     compileSdkVersion 28
+     buildToolsVersion "28.0.3"
+@@ -25,14 +19,6 @@
+     }
+ 
+     signingConfigs {
+-        if (keystorePropertiesFile.exists()) {
+-            release {
+-                keyAlias keystoreProperties['keyAlias']
+-                keyPassword keystoreProperties['keyPassword']
+-                storeFile file(keystoreProperties['storeFile'])
+-                storePassword keystoreProperties['storePassword']
+-            }
+-        }
+     }
+ 
+     buildTypes {
+@@ -43,25 +29,17 @@
+         release {
+             minifyEnabled true
+             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+-            if (keystorePropertiesFile.exists()) {
+-                signingConfig signingConfigs.release
+-            }
+         }
+     }
+ 
+     sourceSets {
+         main.java.srcDirs += 'src/main/kotlin'
+-        if (is_proprietary) {
+-            main.java.srcDirs += 'src/proprietary/kotlin'
+-        }
+     }
+ 
+     flavorDimensions "licensing"
+     productFlavors {
+         proprietary { }
+         foss {
+-            // We're not using PhotoEditor here, so changing the name is fine.
+-            applicationIdSuffix ".foss"
+             versionNameSuffix "-foss"
+         }
+     }