ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: Analytics - get android ui type when called instead of setting it ahead of time 

It's possible to not have set the device type if the user launches a game without going to the main activity(like launching from the TV menu)
This commit is contained in:
zackhow 2018-08-28 18:16:59 -04:00
parent 3d560630f5
commit bbf2184933
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/DolphinApplication.java
View File

@ -1,6 +1,7 @@
package org.dolphinemu.dolphinemu; package org.dolphinemu.dolphinemu;
import android.app.Application; import android.app.Application;
import android.content.Context;
import org.dolphinemu.dolphinemu.services.DirectoryInitializationService; import org.dolphinemu.dolphinemu.services.DirectoryInitializationService;
import org.dolphinemu.dolphinemu.utils.PermissionsHandler; import org.dolphinemu.dolphinemu.utils.PermissionsHandler;
@ -8,15 +9,22 @@ import org.dolphinemu.dolphinemu.utils.VolleyUtil;
public class DolphinApplication extends Application public class DolphinApplication extends Application
{ {
private static DolphinApplication application;
@Override @Override
public void onCreate() public void onCreate()
{ {
super.onCreate(); super.onCreate();
application = this;
VolleyUtil.init(getApplicationContext()); VolleyUtil.init(getApplicationContext());
System.loadLibrary("main"); System.loadLibrary("main");
if (PermissionsHandler.hasWriteAccess(getApplicationContext())) if (PermissionsHandler.hasWriteAccess(getApplicationContext()))
DirectoryInitializationService.startService(getApplicationContext()); DirectoryInitializationService.startService(getApplicationContext());
} }
public static Context getAppContext()
{
return application.getApplicationContext();
}
} }

8
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Analytics.java
View File

@ -11,6 +11,7 @@ import android.support.v4.content.LocalBroadcastManager;
import com.android.volley.Request; import com.android.volley.Request;
import com.android.volley.toolbox.StringRequest; import com.android.volley.toolbox.StringRequest;
import org.dolphinemu.dolphinemu.DolphinApplication;
import org.dolphinemu.dolphinemu.R; import org.dolphinemu.dolphinemu.R;
import org.dolphinemu.dolphinemu.features.settings.model.Settings; import org.dolphinemu.dolphinemu.features.settings.model.Settings;
import org.dolphinemu.dolphinemu.features.settings.utils.SettingsFile; import org.dolphinemu.dolphinemu.features.settings.utils.SettingsFile;
@ -30,8 +31,6 @@ public class Analytics
private static final String DEVICE_MODEL = "DEVICE_MODEL"; private static final String DEVICE_MODEL = "DEVICE_MODEL";
private static final String DEVICE_TYPE = "DEVICE_TYPE"; private static final String DEVICE_TYPE = "DEVICE_TYPE";
private static String deviceType;
public static void checkAnalyticsInit(Context context) public static void checkAnalyticsInit(Context context)
{ {
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
@ -63,8 +62,6 @@ public class Analytics
showMessage(context, preferences); showMessage(context, preferences);
} }
} }
// Get device type now since we have a context
deviceType = TvUtil.isLeanback(context) ? "android-tv" : "android-mobile";
} }
private static void showMessage(Context context, SharedPreferences preferences) private static void showMessage(Context context, SharedPreferences preferences)
@ -120,7 +117,8 @@ public class Analytics
case DEVICE_OS: case DEVICE_OS:
return String.valueOf(Build.VERSION.SDK_INT); return String.valueOf(Build.VERSION.SDK_INT);
case DEVICE_TYPE: case DEVICE_TYPE:
return deviceType; return TvUtil.isLeanback(DolphinApplication.getAppContext()) ? "android-tv" :
"android-mobile";
default: default:
return ""; return "";
} }