Aggiorno per F-Droid

build/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Sun Jul 11 21:53:17 CEST 2021
-gradle.version=6.7
+#Mon Jul 26 20:13:36 CEST 2021
+gradle.version=6.8.3

build/android/app/build.gradle

@@ -8,13 +8,9 @@ if (file("${projectDir}/google-services.json").exists()) {
 
 repositories {
 
-	maven { url 'file:///Users/ferdi2005/Library/Application%20Support/Titanium/mobilesdk/osx/9.3.2.GA/android/m2repository' }
+	maven { url 'file:///Users/ferdi2005/Library/Application%20Support/Titanium/mobilesdk/osx/10.0.0.GA/android/m2repository' }
 
-	maven { url 'file:///Users/ferdi2005/Codice/monumenti/modules/android/ti.osm/1.0.1/m2repository' }
-
-	maven { url 'file:///Users/ferdi2005/Library/Application%20Support/Titanium/modules/android/ti.map/5.0.1/m2repository' }
-
-	maven { url 'file:///Users/ferdi2005/Library/Application%20Support/Titanium/modules/android/hyperloop/7.0.1/m2repository' }
+	maven { url 'file:///Users/ferdi2005/Codice/monumenti/modules/android/ti.osm/1.0.3/m2repository' }
 
 	maven { url 'file:///Users/ferdi2005/Library/Application%20Support/Titanium/modules/android/ti.playservices/17.5.0/m2repository' }
 
@@ -28,10 +24,10 @@ android {
 	compileSdkVersion 30
 	defaultConfig {
 		applicationId 'it.wikimedia.wikilovesmonuments'
-		minSdkVersion 19
+		minSdkVersion 21
 		targetSdkVersion 30
-		versionCode 22
-		versionName '2.1.2'
+		versionCode 29
+		versionName '2.4.2'
 		manifestPlaceholders = project.ext.tiManifestPlaceholders
 		manifestPlaceholders.put('localApplicationId', applicationId) // Legacy placeholder old AARs sometimes use.
 		multiDexEnabled true
@@ -51,7 +47,7 @@ android {
 		targetCompatibility JavaVersion.VERSION_1_8
 	}
 	signingConfigs {
-		def tiKeystoreFilePath = '/Users/ferdi2005/Library/Application Support/Titanium/mobilesdk/osx/9.3.2.GA/android/dev_keystore'
+		def tiKeystoreFilePath = '/Users/ferdi2005/Library/Application Support/Titanium/mobilesdk/osx/10.0.0.GA/android/dev_keystore'
 		if (System.env.TI_ANDROID_APP_KEYSTORE_FILE != null) {
 			tiKeystoreFilePath = System.env.TI_ANDROID_APP_KEYSTORE_FILE
 		}
@@ -108,16 +104,10 @@ dependencies {
 	implementation fileTree(dir: "${projectDir}/src/main", include: ['*.aar', '*.jar'])
 
 
-	implementation project(':lib.ti.flurry')
-
-
-	implementation 'org.appcelerator:titanium:9.3.2'
-
-	implementation 'ti:osm:1.0.1'
 
-	implementation 'ti:map:5.0.1'
+	implementation 'org.appcelerator:titanium:10.0.0'
 
-	implementation 'hyperloop:hyperloop:7.0.1'
+	implementation 'ti:osm:1.0.3'
 
 	implementation 'ti:playservices:17.5.0'
 

build/android/app/src/debug/AndroidManifest.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="22" package="it.wikimedia.wikilovesmonuments" tools:replace="android:versionCode">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="29" package="it.wikimedia.wikilovesmonuments" tools:replace="android:versionCode">
       <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
       <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-      <application android:largeHeap="true" android:hardwareAccelerated="true" tools:replace="android:largeHeap,android:hardwareAccelerated">
-        <meta-data android:name="com.google.android.geo.API_KEY" android:value="AIzaSyBrART7ZFvMWsqUOiYnVXAxzjnf7KaA7-c"/>
-      </application>
+      <application/>
     </manifest>

build/android/app/src/main/AndroidManifest.xml

@@ -25,7 +25,7 @@
 
 
 
-	<application android:icon="@drawable/appicon" android:label="WLM Italia" android:name="WlmItaliaApplication" android:usesCleartextTraffic="true" android:theme="@style/Theme.MaterialComponents.Bridge">
+	<application android:icon="@drawable/appicon" android:label="WLM Italia" android:name="WlmItaliaApplication" android:usesCleartextTraffic="true" android:theme="@style/Theme.Titanium.App">
 
 		<activity android:name=".WlmItaliaActivity" android:configChanges="${tiActivityConfigChanges}" android:label="@string/app_name" android:theme="@style/Theme.Titanium" android:alwaysRetainTaskState="true">
 			<intent-filter>

build/android/app/src/main/assets/Resources/_env_.json.bin

@@ -0,0 +1,2 @@
+,@�O���
+D��A�ǻT

build/android/app/src/main/assets/Resources/images/Info grey.png

@@ -0,0 +1 @@
+/Users/ferdi2005/Codice/monumenti/Resources/android/images/Info grey.png

build/android/app/src/main/assets/Resources/images/Info orange.png

@@ -0,0 +1 @@
+/Users/ferdi2005/Codice/monumenti/Resources/android/images/Info orange.png

build/android/app/src/main/assets/Resources/images/location white.png

@@ -0,0 +1 @@
+/Users/ferdi2005/Codice/monumenti/Resources/android/images/location white.png

build/android/app/src/main/assets/Resources/images/refresh white.png

@@ -0,0 +1 @@
+/Users/ferdi2005/Codice/monumenti/Resources/android/images/refresh white.png

build/android/app/src/main/assets/Resources/images/search white.png

@@ -0,0 +1 @@
+/Users/ferdi2005/Codice/monumenti/Resources/android/images/search white.png

build/android/app/src/main/assets/Resources/images/tree blue android.png

@@ -0,0 +1 @@
+/Users/ferdi2005/Codice/monumenti/Resources/android/images/tree blue android.png

build/android/app/src/main/assets/Resources/images/tree blue ios.png

@@ -0,0 +1 @@
+/Users/ferdi2005/Codice/monumenti/Resources/android/images/tree blue ios.png

build/android/app/src/main/assets/Resources/images/tree orange android.png

@@ -0,0 +1 @@
+/Users/ferdi2005/Codice/monumenti/Resources/android/images/tree orange android.png

build/android/app/src/main/assets/Resources/images/tree orange ios.png

@@ -0,0 +1 @@
+/Users/ferdi2005/Codice/monumenti/Resources/android/images/tree orange ios.png

build/android/app/src/main/assets/Resources/images/tree red android.png

@@ -0,0 +1 @@
+/Users/ferdi2005/Codice/monumenti/Resources/android/images/tree red android.png

build/android/app/src/main/assets/Resources/images/tree red ios.png

@@ -0,0 +1 @@
+/Users/ferdi2005/Codice/monumenti/Resources/android/images/tree red ios.png

build/android/app/src/main/assets/Resources/semantic.colors.json

@@ -0,0 +1 @@
+/Users/ferdi2005/Codice/monumenti/Resources/android/semantic.colors.json

build/android/app/src/main/assets/Resources/ti.internal/bootstrap.json.bin

@@ -1 +1 @@
-�7jmt.�K��s��c?F{�����`k��۾��:셫t~���R���"p֎��<�8+��q��.�����$�v
+��o3��w���v�m���$|�����v"�m����I.�����t�˒�78lA�Ǣ��pqA�Cv�uH?A�

build/android/app/src/main/assets/cache.json

@@ -1 +1 @@
-["Resources/app.js","Resources/alloy/CFG.js","Resources/alloy/backbone.js","Resources/alloy/constants.js","Resources/alloy/controllers/BaseController.js","Resources/alloy/controllers/about/index.js","Resources/alloy/controllers/about/info.js","Resources/alloy/controllers/home/index.js","Resources/alloy/controllers/home/search.js","Resources/alloy/controllers/home/show.js","Resources/alloy/controllers/index.js","Resources/alloy/controllers/upload/config.js","Resources/alloy/controllers/upload/index.js","Resources/alloy/controllers/upload/title.js","Resources/alloy/styles/about/index.js","Resources/alloy/styles/about/info.js","Resources/alloy/styles/home/index.js","Resources/alloy/styles/home/search.js","Resources/alloy/styles/home/show.js","Resources/alloy/styles/index.js","Resources/alloy/styles/upload/config.js","Resources/alloy/styles/upload/index.js","Resources/alloy/styles/upload/title.js","Resources/alloy/sync/localStorage.js","Resources/alloy/sync/properties.js","Resources/alloy/sync/sql.js","Resources/alloy/underscore.js","Resources/alloy/widget.js","Resources/alloy.bootstrap.js","Resources/alloy.js"]
+["Resources/app.js","Resources/alloy/CFG.js","Resources/alloy.bootstrap.js","Resources/alloy.js","Resources/alloy/backbone.js","Resources/alloy/constants.js","Resources/alloy/underscore.js","Resources/alloy/widget.js","Resources/alloy/styles/index.js","Resources/alloy/controllers/BaseController.js","Resources/alloy/controllers/index.js","Resources/alloy/sync/localStorage.js","Resources/alloy/sync/properties.js","Resources/alloy/sync/sql.js","Resources/alloy/styles/about/index.js","Resources/alloy/styles/about/info.js","Resources/alloy/styles/home/index.js","Resources/alloy/styles/home/search.js","Resources/alloy/styles/home/show.js","Resources/alloy/controllers/about/index.js","Resources/alloy/controllers/about/info.js","Resources/alloy/styles/upload/config.js","Resources/alloy/styles/upload/index.js","Resources/alloy/styles/upload/title.js","Resources/alloy/controllers/home/index.js","Resources/alloy/controllers/home/search.js","Resources/alloy/controllers/home/show.js","Resources/alloy/controllers/upload/config.js","Resources/alloy/controllers/upload/index.js","Resources/alloy/controllers/upload/title.js"]

build/android/app/src/main/assets/index.json

@@ -1 +1 @@
-{"Resources/ti.main.js":1,"Resources/alloy/CFG.js":1,"Resources/app.js":1,"Resources/alloy/backbone.js":1,"Resources/alloy/constants.js":1,"Resources/alloy/controllers/BaseController.js":1,"Resources/alloy/controllers/about/index.js":1,"Resources/alloy/controllers/about/info.js":1,"Resources/alloy/controllers/home/index.js":1,"Resources/alloy/controllers/home/search.js":1,"Resources/alloy/controllers/home/show.js":1,"Resources/alloy/controllers/index.js":1,"Resources/alloy/controllers/upload/config.js":1,"Resources/alloy/controllers/upload/index.js":1,"Resources/alloy/controllers/upload/title.js":1,"Resources/alloy/styles/about/index.js":1,"Resources/alloy/styles/about/info.js":1,"Resources/alloy/styles/home/index.js":1,"Resources/alloy/styles/home/search.js":1,"Resources/alloy/styles/home/show.js":1,"Resources/alloy/styles/index.js":1,"Resources/alloy/styles/upload/config.js":1,"Resources/alloy/styles/upload/index.js":1,"Resources/alloy/styles/upload/title.js":1,"Resources/alloy/sync/localStorage.js":1,"Resources/alloy/sync/properties.js":1,"Resources/alloy/sync/sql.js":1,"Resources/alloy/underscore.js":1,"Resources/alloy/widget.js":1,"Resources/alloy.bootstrap.js":1,"Resources/alloy.js":1,"Resources/utilsService.js":1,"Resources/ti.playservices/ti.playservices.bootstrap.js":1,"Resources/ti.internal/bootstrap.json":1}
+{"Resources/semantic.colors.json":1,"Resources/_env_.json":1,"Resources/ti.kernel.js":1,"Resources/ti.main.js":1,"Resources/app.js":1,"Resources/alloy/CFG.js":1,"Resources/alloy.bootstrap.js":1,"Resources/alloy.js":1,"Resources/utilsService.js":1,"Resources/alloy/backbone.js":1,"Resources/alloy/constants.js":1,"Resources/alloy/underscore.js":1,"Resources/alloy/widget.js":1,"Resources/alloy/styles/index.js":1,"Resources/alloy/controllers/BaseController.js":1,"Resources/alloy/controllers/index.js":1,"Resources/alloy/sync/localStorage.js":1,"Resources/alloy/sync/properties.js":1,"Resources/alloy/sync/sql.js":1,"Resources/alloy/styles/about/index.js":1,"Resources/alloy/styles/about/info.js":1,"Resources/alloy/styles/home/index.js":1,"Resources/alloy/styles/home/search.js":1,"Resources/alloy/styles/home/show.js":1,"Resources/alloy/controllers/about/index.js":1,"Resources/alloy/controllers/about/info.js":1,"Resources/alloy/styles/upload/config.js":1,"Resources/alloy/styles/upload/index.js":1,"Resources/alloy/styles/upload/title.js":1,"Resources/alloy/controllers/home/index.js":1,"Resources/alloy/controllers/home/search.js":1,"Resources/alloy/controllers/home/show.js":1,"Resources/alloy/controllers/upload/config.js":1,"Resources/alloy/controllers/upload/index.js":1,"Resources/alloy/controllers/upload/title.js":1,"Resources/ti.playservices/ti.playservices.bootstrap.js":1,"Resources/ti.internal/bootstrap.json":1}

build/android/app/src/main/java/it/wikimedia/wikilovesmonuments/AssetCryptImpl.java

@@ -26,45 +26,47 @@ public class AssetCryptImpl implements KrollAssetHelper.AssetCrypt
 	private static final String BIN_EXT = ".bin";
 
 	private static byte[] salt = {
-		(byte)103, (byte)196, (byte)170, (byte)76, (byte)88, (byte)139, (byte)124, (byte)61, (byte)126, (byte)130, (byte)200, (byte)126, (byte)3, (byte)149, (byte)240, (byte)234
+		(byte)170, (byte)221, (byte)53, (byte)22, (byte)232, (byte)168, (byte)70, (byte)240, (byte)196, (byte)252, (byte)226, (byte)120, (byte)238, (byte)97, (byte)218, (byte)167
 	};
 
 	private static final Collection<String> assets =
 		new ArrayList<String>(Arrays.asList(
+			"Resources/_app_props_.json",
+			"Resources/_env_.json",
+			"Resources/ti.kernel.js",
 			"Resources/ti.main.js",
-			"Resources/alloy/CFG.js",
 			"Resources/app.js",
+			"Resources/alloy/CFG.js",
+			"Resources/alloy.bootstrap.js",
+			"Resources/alloy.js",
+			"Resources/utilsService.js",
 			"Resources/alloy/backbone.js",
 			"Resources/alloy/constants.js",
+			"Resources/alloy/underscore.js",
+			"Resources/alloy/widget.js",
+			"Resources/alloy/styles/index.js",
 			"Resources/alloy/controllers/BaseController.js",
-			"Resources/alloy/controllers/about/index.js",
-			"Resources/alloy/controllers/about/info.js",
-			"Resources/alloy/controllers/home/index.js",
-			"Resources/alloy/controllers/home/search.js",
-			"Resources/alloy/controllers/home/show.js",
 			"Resources/alloy/controllers/index.js",
-			"Resources/alloy/controllers/upload/config.js",
-			"Resources/alloy/controllers/upload/index.js",
-			"Resources/alloy/controllers/upload/title.js",
+			"Resources/alloy/sync/localStorage.js",
+			"Resources/alloy/sync/properties.js",
+			"Resources/alloy/sync/sql.js",
 			"Resources/alloy/styles/about/index.js",
 			"Resources/alloy/styles/about/info.js",
 			"Resources/alloy/styles/home/index.js",
 			"Resources/alloy/styles/home/search.js",
 			"Resources/alloy/styles/home/show.js",
-			"Resources/alloy/styles/index.js",
+			"Resources/alloy/controllers/about/index.js",
+			"Resources/alloy/controllers/about/info.js",
 			"Resources/alloy/styles/upload/config.js",
 			"Resources/alloy/styles/upload/index.js",
 			"Resources/alloy/styles/upload/title.js",
-			"Resources/alloy/sync/localStorage.js",
-			"Resources/alloy/sync/properties.js",
-			"Resources/alloy/sync/sql.js",
-			"Resources/alloy/underscore.js",
-			"Resources/alloy/widget.js",
-			"Resources/alloy.bootstrap.js",
-			"Resources/alloy.js",
-			"Resources/utilsService.js",
+			"Resources/alloy/controllers/home/index.js",
+			"Resources/alloy/controllers/home/search.js",
+			"Resources/alloy/controllers/home/show.js",
+			"Resources/alloy/controllers/upload/config.js",
+			"Resources/alloy/controllers/upload/index.js",
+			"Resources/alloy/controllers/upload/title.js",
 			"Resources/ti.playservices/ti.playservices.bootstrap.js",
-			"Resources/_app_props_.json",
 			"Resources/ti.internal/bootstrap.json"
 		));
 

build/android/app/src/main/java/it/wikimedia/wikilovesmonuments/WlmItaliaAppInfo.java

@@ -29,7 +29,7 @@ public String getName() {
 	}
 
 	public String getVersion() {
-		return "2.1.2";
+		return "2.4.2";
 	}
 
 	public String getPublisher() {
@@ -53,7 +53,7 @@ public String getIcon() {
 	}
 
 	public boolean isAnalyticsEnabled() {
-		return true;
+		return false;
 	}
 
 	public String getGUID() {

build/android/app/src/main/java/it/wikimedia/wikilovesmonuments/WlmItaliaApplication.java

@@ -41,7 +41,6 @@ public void onCreate()
 		KrollAssetCache.init(this);
 
 		super.onCreate();
-		postAppInfo();
 
 		V8Runtime runtime = new V8Runtime();
 
@@ -64,60 +63,6 @@ public void onCreate()
 		}
 
 
-		{
-
-			String className = "ti.map.TiModuleBootstrap";
-
-			try {
-				runtime.addExternalModule(
-						"ti.map",
-						(Class<KrollExternalModule>) Class.forName(className));
-			} catch (Throwable ex) {
-				Log.e(TAG, "Failed to add external module: " + className);
-				if ((ex instanceof RuntimeException) == false) {
-					ex = new RuntimeException(ex);
-				}
-				throw (RuntimeException) ex;
-			}
-		}
-
-
-		{
-
-			String className = "hyperloop.TiModuleBootstrap";
-
-			try {
-				runtime.addExternalModule(
-						"hyperloop",
-						(Class<KrollExternalModule>) Class.forName(className));
-			} catch (Throwable ex) {
-				Log.e(TAG, "Failed to add external module: " + className);
-				if ((ex instanceof RuntimeException) == false) {
-					ex = new RuntimeException(ex);
-				}
-				throw (RuntimeException) ex;
-			}
-		}
-
-
-		{
-
-			String className = "ti.flurry.FlurryAndroidBootstrap";
-
-			try {
-				runtime.addExternalModule(
-						"ti.flurry",
-						(Class<KrollExternalModule>) Class.forName(className));
-			} catch (Throwable ex) {
-				Log.e(TAG, "Failed to add external module: " + className);
-				if ((ex instanceof RuntimeException) == false) {
-					ex = new RuntimeException(ex);
-				}
-				throw (RuntimeException) ex;
-			}
-		}
-
-
 		{
 
 			String className = "ti.playservices.TiModuleBootstrap";
@@ -174,7 +119,7 @@ public void onCreate()
 
 
 		KrollRuntime.init(this, runtime);
-
+		postAppInfo();
 		postOnCreate();
 
 
@@ -203,7 +148,7 @@ public void onCreate()
 
 
 		moduleInfo = new KrollModuleInfo(
-			"ti.osm", "ti.osm", "2d5116e8-1aca-40b9-91f4-e844253c3477", "1.0.1",
+			"ti.osm", "ti.osm", "2d5116e8-1aca-40b9-91f4-e844253c3477", "1.0.3",
 			"ti.osm",
 			"Michael Gangolf",
 			"MIT",
@@ -213,70 +158,6 @@ public void onCreate()
 
 
 
-		KrollModule.addCustomModuleInfo(moduleInfo);
-
-
-
-		moduleInfo = new KrollModuleInfo(
-			"map", "ti.map", "f0d8fd44-86d2-4730-b67d-bd454577aeee", "5.0.1",
-			"External version of Map module using native Google Maps library",
-			"Appcelerator",
-			"Apache Public License v2",
-			"Copyright (c) 2013-present by Axway, Inc.");
-
-
-
-
-
-		KrollModule.addCustomModuleInfo(moduleInfo);
-
-
-
-		moduleInfo = new KrollModuleInfo(
-			"hyperloop-android", "hyperloop", "bdaca69f-b316-4ce6-9065-7a61e1dafa39", "7.0.1",
-			"hyperloop-android",
-			"Appcelerator",
-			"Appcelerator Commercial License",
-			"Copyright (c) 2017-2021 Axway, Inc.");
-
-
-
-
-
-		KrollModule.addCustomModuleInfo(moduleInfo);
-
-
-		{
-			String className = "ti.flurry.FlurryAndroidModule";
-			String methodName = "onAppCreate";
-			try {
-				Class moduleClass = Class.forName(className);
-				Method moduleMethod = moduleClass.getMethod(methodName, TiApplication.class);
-				moduleMethod.invoke(null, this);
-			} catch (Throwable ex) {
-				Log.e(TAG, "Error invoking: " + className + "." + methodName + "()");
-				if ((ex instanceof InvocationTargetException) && (ex.getCause() != null)) {
-					ex = ex.getCause();
-				}
-				if ((ex instanceof RuntimeException) == false) {
-					ex = new RuntimeException(ex);
-				}
-				throw (RuntimeException) ex;
-			}
-		}
-
-
-		moduleInfo = new KrollModuleInfo(
-			"flurry_android", "ti.flurry", "cb18a7d2-baa4-4c0d-a0b1-b07b8676f2ec", "3.0.0",
-			"Flurry event reporting module",
-			"Ayo Adesugba",
-			"Apache License, Version 2.0",
-			"Copyright (c) 2010-2014 by Appcelerator, Inc.");
-
-
-
-
-
 		KrollModule.addCustomModuleInfo(moduleInfo);
 
 
@@ -330,6 +211,6 @@ public void onCreate()
 	@Override
 	public void verifyCustomModules(TiRootActivity rootActivity)
 	{
-
+		// This method is needed by the "appc" CLI.
 	}
 }