diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 0c5b26ab5a..55abdc7dd5 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -287,7 +287,7 @@ bool CheckFontIsUsable(const wchar_t *fontFace) { #endif void NativeInit(int argc, const char *argv[], - const char *savegame_directory, const char *external_directory, const char *installID, bool fs) { + const char *savegame_directory, const char *external_directory, bool fs) { #ifdef ANDROID_NDK_PROFILER setenv("CPUPROFILE_FREQUENCY", "500", 1); setenv("CPUPROFILE", "/sdcard/gmon.out", 1); diff --git a/Windows/EmuThread.cpp b/Windows/EmuThread.cpp index 4bac1facf4..cb8ea82fab 100644 --- a/Windows/EmuThread.cpp +++ b/Windows/EmuThread.cpp @@ -114,7 +114,7 @@ unsigned int WINAPI TheThread(void *) args.push_back(string.c_str()); } - NativeInit(static_cast(args.size()), &args[0], "1234", "1234", "1234"); + NativeInit(static_cast(args.size()), &args[0], "1234", "1234"); Host *nativeHost = host; host = oldHost; diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index 5153c2698e..940819d183 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -276,7 +276,7 @@ extern "C" jstring Java_org_ppsspp_ppsspp_NativeApp_queryConfig extern "C" void Java_org_ppsspp_ppsspp_NativeApp_init (JNIEnv *env, jclass, jstring jmodel, jint jdeviceType, jstring jlangRegion, jstring japkpath, jstring jdataDir, jstring jexternalDir, jstring jlibraryDir, jstring jshortcutParam, - jstring jinstallID, jint jAndroidVersion) { + jint jAndroidVersion) { jniEnvUI = env; setCurrentThreadName("androidInit"); @@ -309,7 +309,6 @@ extern "C" void Java_org_ppsspp_ppsspp_NativeApp_init std::string user_data_path = GetJavaString(env, jdataDir) + "/"; library_path = GetJavaString(env, jlibraryDir) + "/"; std::string shortcut_param = GetJavaString(env, jshortcutParam); - std::string installID = GetJavaString(env, jinstallID); ILOG("NativeApp.init(): External storage path: %s", externalDir.c_str()); ILOG("NativeApp.init(): Launch shortcut parameter: %s", shortcut_param.c_str()); @@ -329,11 +328,11 @@ extern "C" void Java_org_ppsspp_ppsspp_NativeApp_init if (shortcut_param.empty()) { const char *argv[2] = {app_name.c_str(), 0}; - NativeInit(1, argv, user_data_path.c_str(), externalDir.c_str(), installID.c_str()); + NativeInit(1, argv, user_data_path.c_str(), externalDir.c_str()); } else { const char *argv[3] = {app_name.c_str(), shortcut_param.c_str(), 0}; - NativeInit(2, argv, user_data_path.c_str(), externalDir.c_str(), installID.c_str()); + NativeInit(2, argv, user_data_path.c_str(), externalDir.c_str()); } ILOG("NativeApp.init() -- end"); diff --git a/android/src/org/ppsspp/ppsspp/Installation.java b/android/src/org/ppsspp/ppsspp/Installation.java deleted file mode 100644 index 7291bd1864..0000000000 --- a/android/src/org/ppsspp/ppsspp/Installation.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.ppsspp.ppsspp; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.RandomAccessFile; -import java.util.UUID; - -import android.content.Context; - - -public class Installation { - private static String sID = null; - private static final String INSTALLATION = "INSTALLATION"; - - public synchronized static String id(Context context) { - if (sID == null) { - File installation = new File(context.getFilesDir(), INSTALLATION); - try { - if (!installation.exists()) - writeInstallationFile(installation); - sID = readInstallationFile(installation); - } catch (Exception e) { - // We can't even open a file for writing? Then we can't get a unique-ish installation id. - return "BROKENAPPUSERFILESYSTEM"; - } - } - return sID; - } - - private static String readInstallationFile(File installation) throws IOException { - RandomAccessFile f = new RandomAccessFile(installation, "r"); - byte[] bytes = new byte[(int) f.length()]; - f.readFully(bytes); - f.close(); - return new String(bytes); - } - - private static void writeInstallationFile(File installation) throws IOException { - FileOutputStream out = new FileOutputStream(installation); - String id = UUID.randomUUID().toString(); - out.write(id.getBytes()); - out.close(); - } -} - \ No newline at end of file diff --git a/android/src/org/ppsspp/ppsspp/NativeActivity.java b/android/src/org/ppsspp/ppsspp/NativeActivity.java index b2130e91fe..61086a7a0f 100644 --- a/android/src/org/ppsspp/ppsspp/NativeActivity.java +++ b/android/src/org/ppsspp/ppsspp/NativeActivity.java @@ -65,7 +65,6 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback { public static String runCommand; public static String commandParameter; - public static String installID; // Remember settings for best audio latency private int optimalFramesPerBuffer; @@ -245,7 +244,7 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback { String languageRegion = Locale.getDefault().getLanguage() + "_" + Locale.getDefault().getCountry(); NativeApp.audioConfig(optimalFramesPerBuffer, optimalSampleRate); - NativeApp.init(model, deviceType, languageRegion, apkFilePath, dataDir, externalStorageDir, libraryDir, shortcutParam, installID, Build.VERSION.SDK_INT); + NativeApp.init(model, deviceType, languageRegion, apkFilePath, dataDir, externalStorageDir, libraryDir, shortcutParam, Build.VERSION.SDK_INT); NativeApp.sendMessage("cacheDir", getCacheDir().getAbsolutePath()); @@ -365,7 +364,6 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); registerCallbacks(); - installID = Installation.id(this); updateDisplayMetrics(null); diff --git a/android/src/org/ppsspp/ppsspp/NativeApp.java b/android/src/org/ppsspp/ppsspp/NativeApp.java index e15252191a..0d09605782 100644 --- a/android/src/org/ppsspp/ppsspp/NativeApp.java +++ b/android/src/org/ppsspp/ppsspp/NativeApp.java @@ -13,7 +13,7 @@ public class NativeApp { public final static int DEVICE_TYPE_TV = 1; public final static int DEVICE_TYPE_DESKTOP = 2; - public static native void init(String model, int deviceType, String languageRegion, String apkPath, String dataDir, String externalDir, String libraryDir, String shortcutParam, String installID, int androidVersion); + public static native void init(String model, int deviceType, String languageRegion, String apkPath, String dataDir, String externalDir, String libraryDir, String shortcutParam, int androidVersion); public static native void audioInit(); public static native void audioShutdown(); diff --git a/ext/native/base/BlackberryMain.cpp b/ext/native/base/BlackberryMain.cpp index 3540a80df8..31449e766a 100644 --- a/ext/native/base/BlackberryMain.cpp +++ b/ext/native/base/BlackberryMain.cpp @@ -266,7 +266,7 @@ void BlackberryMain::startMain(int argc, char *argv[]) { navigator_request_events(0); dialog_request_events(0); vibration_request_events(0); - NativeInit(argc, (const char **)argv, "/accounts/1000/shared/misc/", "app/native/assets/", "BADCOFFEE"); + NativeInit(argc, (const char **)argv, "/accounts/1000/shared/misc/", "app/native/assets/"); graphicsContext = new GLDummyGraphicsContext(); NativeInitGraphics(graphicsContext); audio = new BlackberryAudio(); diff --git a/ext/native/base/NativeApp.h b/ext/native/base/NativeApp.h index daa5a8cbba..3517c868f9 100644 --- a/ext/native/base/NativeApp.h +++ b/ext/native/base/NativeApp.h @@ -46,7 +46,7 @@ bool NativeIsAtTopLevel(); // The very first function to be called after NativeGetAppInfo. Even NativeMix is not called // before this, although it may be called at any point in time afterwards (on any thread!) // This functions must NOT call OpenGL. Main thread. -void NativeInit(int argc, const char *argv[], const char *savegame_directory, const char *external_directory, const char *installID, bool fs=false); +void NativeInit(int argc, const char *argv[], const char *savegame_directory, const char *external_directory, bool fs=false); // Runs after NativeInit() at some point. May (and probably should) call OpenGL. // Should not initialize anything screen-size-dependent - do that in NativeResized. diff --git a/ext/native/base/PCMain.cpp b/ext/native/base/PCMain.cpp index 9ab0ef9f6f..6b183122bb 100644 --- a/ext/native/base/PCMain.cpp +++ b/ext/native/base/PCMain.cpp @@ -616,9 +616,9 @@ int main(int argc, char *argv[]) { #endif #ifdef _WIN32 - NativeInit(argc, (const char **)argv, path, "D:\\", "BADCOFFEE"); + NativeInit(argc, (const char **)argv, path, "D:\\"); #else - NativeInit(argc, (const char **)argv, path, "/tmp", "BADCOFFEE"); + NativeInit(argc, (const char **)argv, path, "/tmp"); #endif pixel_in_dps = (float)pixel_xres / dp_xres; diff --git a/ext/native/base/QtMain.cpp b/ext/native/base/QtMain.cpp index 3131591be2..7e7c12d141 100644 --- a/ext/native/base/QtMain.cpp +++ b/ext/native/base/QtMain.cpp @@ -241,7 +241,7 @@ int main(int argc, char *argv[]) if (!strcmp(argv[i],"--fullscreen")) fullscreenCLI=true; } - NativeInit(argc, (const char **)argv, savegame_dir.c_str(), assets_dir.c_str(), "BADCOFFEE",fullscreenCLI); + NativeInit(argc, (const char **)argv, savegame_dir.c_str(), assets_dir.c_str(), fullscreenCLI); int ret = mainInternal(a); diff --git a/ios/ViewController.mm b/ios/ViewController.mm index e1a09cfe92..2eb59c955a 100644 --- a/ios/ViewController.mm +++ b/ios/ViewController.mm @@ -120,7 +120,7 @@ static GraphicsContext *graphicsContext; } } - NativeInit(0, NULL, [self.documentsPath UTF8String], [self.bundlePath UTF8String], NULL); + NativeInit(0, NULL, [self.documentsPath UTF8String], [self.bundlePath UTF8String]); iCadeToKeyMap[iCadeJoystickUp] = NKCODE_DPAD_UP; iCadeToKeyMap[iCadeJoystickRight] = NKCODE_DPAD_RIGHT;