RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor

pull/653/merge
Varun Patil 2023-05-13 17:50:40 -07:00
parent 18817f2642
commit 7f0a75eae2
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/gallery/memories/NativeX.kt
View File

@ -42,9 +42,6 @@ class NativeX(private val mActivity: AppCompatActivity) {
companion object { companion object {
lateinit var mDlService: DownloadService lateinit var mDlService: DownloadService
fun getDlService(): DownloadService {
return mDlService;
}
} }
fun handleRequest(request: WebResourceRequest): WebResourceResponse { fun handleRequest(request: WebResourceRequest): WebResourceResponse {

2
app/src/main/java/gallery/memories/service/Fields.kt → app/src/main/java/gallery/memories/mapper/Fields.kt
View File

@ -1,4 +1,4 @@
package gallery.memories.service package gallery.memories.mapper
class Fields { class Fields {
object Day { object Day {

2
app/src/main/java/gallery/memories/service/DownloadBroadcastReceiver.kt
View File

@ -7,6 +7,6 @@ import gallery.memories.NativeX
class DownloadBroadcastReceiver : BroadcastReceiver() { class DownloadBroadcastReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
NativeX.getDlService().runDownloadCallback(intent) NativeX.mDlService.runDownloadCallback(intent)
} }
} }

4
app/src/main/java/gallery/memories/service/TimelineQuery.kt
View File

@ -16,6 +16,7 @@ import androidx.activity.result.contract.ActivityResultContracts
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.collection.ArraySet import androidx.collection.ArraySet
import androidx.exifinterface.media.ExifInterface import androidx.exifinterface.media.ExifInterface
import gallery.memories.mapper.Fields
import gallery.memories.mapper.SystemImage import gallery.memories.mapper.SystemImage
import org.json.JSONArray import org.json.JSONArray
import org.json.JSONException import org.json.JSONException
@ -142,7 +143,8 @@ class TimelineQuery(private val mCtx: AppCompatActivity) {
try { try {
val exif = ExifInterface(image.dataPath) val exif = ExifInterface(image.dataPath)
obj.put(Fields.Photo.EXIF, JSONObject() obj.put(
Fields.Photo.EXIF, JSONObject()
.put("Aperture", exif.getAttribute(ExifInterface.TAG_APERTURE_VALUE)) .put("Aperture", exif.getAttribute(ExifInterface.TAG_APERTURE_VALUE))
.put("FocalLength", exif.getAttribute(ExifInterface.TAG_FOCAL_LENGTH)) .put("FocalLength", exif.getAttribute(ExifInterface.TAG_FOCAL_LENGTH))
.put("FNumber", exif.getAttribute(ExifInterface.TAG_F_NUMBER)) .put("FNumber", exif.getAttribute(ExifInterface.TAG_F_NUMBER))