MainActivity.kt の更新

Author: RabimiYT

app/src/main/java/com/rabimi/javaskinchanger/MainActivity.kt

@@ -7,6 +7,7 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.os.Bundle
 import android.provider.MediaStore
+import android.util.Log
 import android.view.View
 import android.widget.*
 import androidx.appcompat.app.AlertDialog
@@ -19,7 +20,7 @@ import java.net.URL
 
 class MainActivity : Activity() {
 
-    companion object { private const val TAG = "SkinDebug" }
+    companion object { private const val TAG = "SkinUpload" }
 
     private lateinit var txtUsername: TextView
     private lateinit var btnSelect: Button
@@ -55,27 +56,24 @@ class MainActivity : Activity() {
 
         setupUI()
         checkLogin()
-
-        // ★ 初期スキンは res/raw/steve.png
         loadDefaultSteveSkin()
     }
 
-    /** res/raw/steve.png を読み込む */
-    private fun loadDefaultSteveSkin() {
-        val input = resources.openRawResource(R.raw.steve)
-        val bmp = BitmapFactory.decodeStream(input)
-        val resized = resizeTo64(bmp)
-
-        currentSkinBitmap = resized
-        skinView.setImageBitmap(resized)
-    }
-
     private fun setupUI() {
         btnSelect.backgroundTintList = ColorStateList.valueOf(colorSelect)
         btnUpload.backgroundTintList = ColorStateList.valueOf(colorUploadInitial)
         btnUpload.visibility = View.GONE
         progressBar.visibility = View.GONE
 
+        // ★ 文字を白色に統一
+        val white = getColor(R.color.white)
+        txtUsername.setTextColor(white)
+        lblModel.setTextColor(white)
+        btnSelect.setTextColor(white)
+        btnUpload.setTextColor(white)
+        btnLibrary.setTextColor(white)
+        btnLogout.setTextColor(white)
+
         switchModel.setOnCheckedChangeListener { _, isChecked ->
             lblModel.text = if (isChecked) "モデル: Alex" else "モデル: Steve"
         }
@@ -84,10 +82,7 @@ class MainActivity : Activity() {
         btnUpload.setOnClickListener { handleUpload() }
 
         btnLibrary.setOnClickListener {
-            AlertDialog.Builder(this)
-                .setMessage("未実装")
-                .setPositiveButton("OK", null)
-                .show()
+            AlertDialog.Builder(this).setMessage("未実装").setPositiveButton("OK", null).show()
         }
 
         btnLogout.setOnClickListener {
@@ -97,10 +92,19 @@ class MainActivity : Activity() {
         }
     }
 
+    /** res/raw/steve.png 読み込み */
+    private fun loadDefaultSteveSkin() {
+        val input = resources.openRawResource(R.raw.steve)
+        val bmp = BitmapFactory.decodeStream(input)
+        currentSkinBitmap = resizeTo64(bmp)
+        skinView.setImageBitmap(currentSkinBitmap)
+    }
+
     private fun checkLogin() {
-        val prefs = getSharedPreferences("prefs", MODE_PRIVATE)
-        val username = prefs.getString("minecraft_username", null)
-        val token = prefs.getString("minecraft_token", null)
+        val p = getSharedPreferences("prefs", MODE_PRIVATE)
+        val username = p.getString("minecraft_username", null)
+        val token = p.getString("minecraft_token", null)
+
         if (username == null || token == null) {
             startActivity(Intent(this, WelcomeActivity::class.java))
             finish()
@@ -109,7 +113,6 @@ class MainActivity : Activity() {
         }
     }
 
-    /** ファイル選択 */
     private fun selectSkinImage() {
         val intent = Intent(Intent.ACTION_GET_CONTENT).apply { type = "image/*" }
         startActivityForResult(Intent.createChooser(intent, "スキンを選択"), REQUEST_SKIN_PICK)
@@ -119,7 +122,6 @@ class MainActivity : Activity() {
         super.onActivityResult(req, res, data)
         if (req == REQUEST_SKIN_PICK && res == Activity.RESULT_OK) {
             val uri = data?.data ?: return
-
             try {
                 val orig = MediaStore.Images.Media.getBitmap(contentResolver, uri)
                 val bmp = resizeTo64(orig)
@@ -133,8 +135,7 @@ class MainActivity : Activity() {
             } catch (e: Exception) {
                 e.printStackTrace()
                 AlertDialog.Builder(this)
-                    .setTitle("エラー")
-                    .setMessage("スキンの読み込みに失敗しました: ${e.message}")
+                    .setMessage("スキンの読み込み失敗: ${e.message}")
                     .setPositiveButton("OK", null)
                     .show()
             }
@@ -150,43 +151,38 @@ class MainActivity : Activity() {
         )
     }
 
-    /** アップロード */
+    /** 実行ボタン */
     private fun handleUpload() {
-        val bmp = currentSkinBitmap ?: run {
-            Toast.makeText(this, "スキンが選択されていません", Toast.LENGTH_SHORT).show()
-            return
-        }
-
+        val bmp = currentSkinBitmap ?: return
         val prefs = getSharedPreferences("prefs", MODE_PRIVATE)
-        val mcToken = prefs.getString("minecraft_token", null) ?: return
-        val modelType = if (switchModel.isChecked) "slim" else "classic"
+        val token = prefs.getString("minecraft_token", null) ?: return
+        val model = if (switchModel.isChecked) "slim" else "classic"
 
         progressBar.visibility = View.VISIBLE
         progressBar.progress = 0
 
         scope.launch {
-            val ok = uploadSkin(mcToken, bmp, modelType) { progress ->
-                progressBar.progress = progress
-            }
-
+            val ok = uploadSkin(token, bmp, model) { progressBar.progress = it }
             progressBar.visibility = View.GONE
+
             Toast.makeText(
                 this@MainActivity,
-                if (ok) "アップロード完了" else "アップロード失敗",
-                Toast.LENGTH_SHORT
+                if (ok) "アップロード成功" else "アップロード失敗（ログ確認）",
+                Toast.LENGTH_LONG
             ).show()
         }
     }
 
-    /** Mojang API 正式対応のスキンアップロード */
+    /** 本物の Mojang API 仕様に合わせた multipart */
     private suspend fun uploadSkin(
         token: String,
         bmp: Bitmap,
         model: String,
         onProgress: (Int) -> Unit
     ): Boolean = withContext(Dispatchers.IO) {
+
         try {
-            val boundary = "----RabimiSkinBoundary"
+            val boundary = "----RabimiBoundary"
             val url = URL("https://api.minecraftservices.com/minecraft/profile/skins")
             val conn = url.openConnection() as HttpURLConnection
 
@@ -199,47 +195,58 @@ class MainActivity : Activity() {
 
             val out = DataOutputStream(conn.outputStream)
 
-            // skinModel
+            Log.d(TAG, "variant = $model")
+
+            // ★ variant が正しいキー名（skinModel ではない）
             out.writeBytes("--$boundary\r\n")
-            out.writeBytes("Content-Disposition: form-data; name=\"skinModel\"\r\n\r\n")
+            out.writeBytes("Content-Disposition: form-data; name=\"variant\"\r\n\r\n")
             out.writeBytes("$model\r\n")
 
-            // file
+            // PNG file
             out.writeBytes("--$boundary\r\n")
             out.writeBytes("Content-Disposition: form-data; name=\"file\"; filename=\"skin.png\"\r\n")
             out.writeBytes("Content-Type: image/png\r\n\r\n")
 
-            val pngBaos = ByteArrayOutputStream()
-            bmp.compress(Bitmap.CompressFormat.PNG, 100, pngBaos)
-            val bytes = pngBaos.toByteArray()
-
-            val chunk = (bytes.size / 100).coerceAtLeast(1)
+            val png = ByteArrayOutputStream().apply {
+                bmp.compress(Bitmap.CompressFormat.PNG, 100, this)
+            }.toByteArray()
 
+            val chunk = (png.size / 100).coerceAtLeast(1)
             var written = 0
+
             for (i in 0 until 100) {
                 val start = i * chunk
-                if (start >= bytes.size) break
-                val end = ((i + 1) * chunk).coerceAtMost(bytes.size)
-                out.write(bytes, start, end - start)
+                if (start >= png.size) break
+                val end = ((i + 1) * chunk).coerceAtMost(png.size)
+                out.write(png, start, end - start)
                 written = end
                 onProgress(i + 1)
             }
 
-            // 残り書き込み
-            if (written < bytes.size) {
-                out.write(bytes, written, bytes.size - written)
+            if (written < png.size) {
+                out.write(png, written, png.size - written)
                 onProgress(100)
             }
 
             out.writeBytes("\r\n--$boundary--\r\n")
             out.flush()
             out.close()
 
-            val rc = conn.responseCode
-            rc in 200..299
+            val code = conn.responseCode
+            Log.d(TAG, "HTTP code = $code")
+
+            if (code !in 200..299) {
+                val err = conn.errorStream?.bufferedReader()?.readText()
+                Log.e(TAG, "Error response: $err")
+            } else {
+                val ok = conn.inputStream.bufferedReader().readText()
+                Log.d(TAG, "Success: $ok")
+            }
+
+            code in 200..299
 
         } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(TAG, "UPLOAD ERROR", e)
             false
         }
     }