rename variables
parent
55e5c05d54
commit
d2c12316d3
|
@ -186,7 +186,7 @@ class SystemImage {
|
||||||
try {
|
try {
|
||||||
return ExifInterface(dataPath)
|
return ExifInterface(dataPath)
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
Log.e(TAG, "Failed to read EXIF daddta: " + e.message)
|
Log.w(TAG, "Failed to read EXIF data: " + e.message)
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -204,7 +204,7 @@ class SystemImage {
|
||||||
return it.time / 1000
|
return it.time / 1000
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
Log.e(TAG, "Failed to read EXIF datetime: " + e.message)
|
Log.w(TAG, "Failed to read EXIF datetime: " + e.message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -217,18 +217,18 @@ class SystemImage {
|
||||||
}
|
}
|
||||||
|
|
||||||
fun buid(exif: ExifInterface?): String {
|
fun buid(exif: ExifInterface?): String {
|
||||||
var imageUniqueId = "size=$size"
|
var sfx = "size=$size"
|
||||||
if (exif != null) {
|
if (exif != null) {
|
||||||
try {
|
try {
|
||||||
val iuid = exif.getAttribute(ExifInterface.TAG_IMAGE_UNIQUE_ID)
|
val iuid = exif.getAttribute(ExifInterface.TAG_IMAGE_UNIQUE_ID)
|
||||||
?: throw IOException()
|
?: throw IOException()
|
||||||
imageUniqueId = "iuid=$iuid"
|
sfx = "iuid=$iuid"
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
Log.e(TAG, "Failed to read EXIF unique ID ($baseName): " + e.message)
|
Log.w(TAG, "Failed to read EXIF unique ID ($baseName): " + e.message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return md5("$baseName$imageUniqueId");
|
return md5("$baseName$sfx");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue