From 463e3fce32cd0bad2492415bbd0b7aa01d0eec03 Mon Sep 17 00:00:00 2001
From: Matthieu <61561059+Wv5twkFEKh54vo4tta9yu7dHa3@users.noreply.github.com>
Date: Fri, 6 Mar 2020 00:24:43 +0100
Subject: [PATCH] Remove changes from other PR

---
 .../java/com/h/pixeldroid/objects/Emoji.kt    |  3 +--
 .../java/com/h/pixeldroid/objects/Post.kt     | 21 ---------------
 .../java/com/h/pixeldroid/objects/Status.kt   |  1 +
 .../main/java/com/h/pixeldroid/objects/Tag.kt |  3 +--
 .../com/h/pixeldroid/utils/ImageConverter.kt  | 26 -------------------
 5 files changed, 3 insertions(+), 51 deletions(-)
 delete mode 100644 app/src/main/java/com/h/pixeldroid/objects/Post.kt
 delete mode 100644 app/src/main/java/com/h/pixeldroid/utils/ImageConverter.kt

diff --git a/app/src/main/java/com/h/pixeldroid/objects/Emoji.kt b/app/src/main/java/com/h/pixeldroid/objects/Emoji.kt
index 09d0a6d2..4c7dd769 100644
--- a/app/src/main/java/com/h/pixeldroid/objects/Emoji.kt
+++ b/app/src/main/java/com/h/pixeldroid/objects/Emoji.kt
@@ -8,5 +8,4 @@ data class Emoji(
     val visible_in_picker: Boolean,
     //Optional attributes
     val category: String? = null
-)
-
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/h/pixeldroid/objects/Post.kt b/app/src/main/java/com/h/pixeldroid/objects/Post.kt
deleted file mode 100644
index c8e87fb9..00000000
--- a/app/src/main/java/com/h/pixeldroid/objects/Post.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.h.pixeldroid.objects
-
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.appcompat.app.AppCompatActivity
-import com.h.pixeldroid.utils.ImageConverter.Companion.retrieveBitmapFromUrl
-import java.io.Serializable
-
-class Post(private val status: Status) : Serializable {
-
-    fun getPostImage(context : AppCompatActivity) : ImageView {
-        //Retreive the url from the list of media attachments
-        val imgUrl = status.component9()[0].component3()
-
-        //Convert retrieved bitmap to an ImageView and return it
-        val imageView: ImageView = ImageView(context)
-        imageView.setImageBitmap(retrieveBitmapFromUrl(imgUrl))
-        return imageView
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/h/pixeldroid/objects/Status.kt b/app/src/main/java/com/h/pixeldroid/objects/Status.kt
index 589aeb48..c6064cba 100644
--- a/app/src/main/java/com/h/pixeldroid/objects/Status.kt
+++ b/app/src/main/java/com/h/pixeldroid/objects/Status.kt
@@ -1,5 +1,6 @@
 package com.h.pixeldroid.objects
 
+
 /*
 Represents a status posted by an account.
 https://docs.joinmastodon.org/entities/status/
diff --git a/app/src/main/java/com/h/pixeldroid/objects/Tag.kt b/app/src/main/java/com/h/pixeldroid/objects/Tag.kt
index ce67888d..c15dcc7e 100644
--- a/app/src/main/java/com/h/pixeldroid/objects/Tag.kt
+++ b/app/src/main/java/com/h/pixeldroid/objects/Tag.kt
@@ -6,5 +6,4 @@ data class Tag(
     val url: String,
     //Optional attributes
     val history: List<History>? = emptyList()
-)
-
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/h/pixeldroid/utils/ImageConverter.kt b/app/src/main/java/com/h/pixeldroid/utils/ImageConverter.kt
deleted file mode 100644
index a2b7a9b9..00000000
--- a/app/src/main/java/com/h/pixeldroid/utils/ImageConverter.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.h.pixeldroid.utils
-
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import java.io.IOException
-import java.io.InputStream
-import java.net.HttpURLConnection
-import java.net.URL
-
-class ImageConverter {
-    companion object {
-        fun retrieveBitmapFromUrl(src : String) : Bitmap? {
-            return try {
-                val url: URL = URL(src)
-                val connection : HttpURLConnection = url.openConnection() as HttpURLConnection
-                connection.doInput = true
-                connection.connect()
-                val input : InputStream = connection.inputStream
-                BitmapFactory.decodeStream(input)
-            } catch (e : IOException) {
-                e.printStackTrace()
-                null
-            }
-        }
-    }
-}