From f6225e96940185bea50483f39239d7f4afb6c0ce Mon Sep 17 00:00:00 2001
From: zackhow <zackhow@gmail.com>
Date: Sat, 23 Mar 2019 08:10:13 -0400
Subject: [PATCH] Android: update IR defaults

---
 .../Android/app/src/main/assets/WiimoteNew.ini   |  8 ++++----
 .../app/src/main/assets/WiimoteProfile.ini       |  2 +-
 .../utils/DirectoryInitialization.java           | 16 +++++++++++++++-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Source/Android/app/src/main/assets/WiimoteNew.ini b/Source/Android/app/src/main/assets/WiimoteNew.ini
index caa82c3268..e1a3804587 100644
--- a/Source/Android/app/src/main/assets/WiimoteNew.ini
+++ b/Source/Android/app/src/main/assets/WiimoteNew.ini
@@ -19,7 +19,7 @@ IR/Forward = `Axis 116`
 IR/Backward = `Axis 117`
 IR/Hide = `Button 118`
 IR/Height = 50
-IR/Width = 30
+IR/Width = 50
 IR/Center = 50
 Swing/Up = `Axis 120`
 Swing/Down = `Axis 121`
@@ -158,7 +158,7 @@ IR/Forward = `Axis 116`
 IR/Backward = `Axis 117`
 IR/Hide = `Button 118`
 IR/Height = 50
-IR/Width = 30
+IR/Width = 50
 IR/Center = 50
 Swing/Up = `Axis 120`
 Swing/Down = `Axis 121`
@@ -297,7 +297,7 @@ IR/Forward = `Axis 116`
 IR/Backward = `Axis 117`
 IR/Hide = `Button 118`
 IR/Height = 50
-IR/Width = 30
+IR/Width = 50
 IR/Center = 50
 Swing/Up = `Axis 120`
 Swing/Down = `Axis 121`
@@ -436,7 +436,7 @@ IR/Forward = `Axis 116`
 IR/Backward = `Axis 117`
 IR/Hide = `Button 118`
 IR/Height = 50
-IR/Width = 30
+IR/Width = 50
 IR/Center = 50
 Swing/Up = `Axis 120`
 Swing/Down = `Axis 121`
diff --git a/Source/Android/app/src/main/assets/WiimoteProfile.ini b/Source/Android/app/src/main/assets/WiimoteProfile.ini
index f31f68346c..2283a1add2 100644
--- a/Source/Android/app/src/main/assets/WiimoteProfile.ini
+++ b/Source/Android/app/src/main/assets/WiimoteProfile.ini
@@ -19,7 +19,7 @@ IR/Forward = `Axis 116`
 IR/Backward = `Axis 117`
 IR/Hide = `Button 118`
 IR/Height = 50
-IR/Width = 30
+IR/Width = 50
 IR/Center = 50
 Swing/Up = `Axis 120`
 Swing/Down = `Axis 121`
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java
index c8b54b36f0..47925df998 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java
@@ -34,6 +34,7 @@ public final class DirectoryInitialization
           "org.dolphinemu.dolphinemu.DIRECTORY_INITIALIZATION";
 
   public static final String EXTRA_STATE = "directoryState";
+  private static final Integer WiimoteNewVersion = 2;
   private static volatile DirectoryInitializationState directoryState = null;
   private static String userPath;
   private static String internalPath;
@@ -145,7 +146,20 @@ public final class DirectoryInitialization
     createWiimoteProfileDirectory(profileDirectory);
 
     copyAsset("GCPadNew.ini", new File(configDirectory, "GCPadNew.ini"), true, context);
-    copyAsset("WiimoteNew.ini", new File(configDirectory, "WiimoteNew.ini"), false, context);
+
+    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+    if (prefs.getInt("WiimoteNewVersion", 0) != WiimoteNewVersion)
+    {
+      copyAsset("WiimoteNew.ini", new File(configDirectory, "WiimoteNew.ini"), true, context);
+      SharedPreferences.Editor sPrefsEditor = prefs.edit();
+      sPrefsEditor.putInt("WiimoteNewVersion", WiimoteNewVersion);
+      sPrefsEditor.apply();
+    }
+    else
+    {
+      copyAsset("WiimoteNew.ini", new File(configDirectory, "WiimoteNew.ini"), false, context);
+    }
+
     copyAsset("WiimoteProfile.ini", new File(profileDirectory, "WiimoteProfile.ini"), true,
             context);
   }