Add community server selection system
- NEW: ServerSelectionActivity as main launcher - Beautiful startup menu (Offline/Online modes) - URL input dialog with custom port support - Quick select presets (Official/Local/Custom) - 'Remember my choice' persistence - Help dialog for first-time users - NEW: ServerManager for Nimble SDK URL overrides - Automatically configures all EA endpoints - Supports custom ports (:8443, :3000, etc.) - Comprehensive error handling and logging - Modified MainActivity to read Intent extras - Reads mode (online/offline) from ServerSelectionActivity - Configures custom server before game init - Maintains backward compatibility - Modified AndroidManifest.xml - ServerSelectionActivity is now LAUNCHER - UnpackAssetsActivity no longer exports MAIN intent - Intent extras preserved through activity chain - Added XML layouts - activity_server_selection.xml (main menu UI) - dialog_server_input.xml (URL input dialog) - Server URL format: https://domain.com:port - SharedPreferences: rr3_server_config.xml Ready for Phase 2: Community server backend implementation Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
@@ -0,0 +1,233 @@
|
||||
.class public Lcom/firemint/realracing/ServerSelectionActivity;
|
||||
.super Landroid/app/Activity;
|
||||
.source "ServerSelectionActivity.java"
|
||||
|
||||
|
||||
# direct methods
|
||||
.method public constructor <init>()V
|
||||
.locals 0
|
||||
|
||||
invoke-direct {p0}, Landroid/app/Activity;-><init>()V
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method static synthetic access$000(Lcom/firemint/realracing/ServerSelectionActivity;Ljava/lang/String;Ljava/lang/String;)V
|
||||
.locals 0
|
||||
|
||||
invoke-direct {p0, p1, p2}, Lcom/firemint/realracing/ServerSelectionActivity;->startMainActivity(Ljava/lang/String;Ljava/lang/String;)V
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method static synthetic access$100(Lcom/firemint/realracing/ServerSelectionActivity;)V
|
||||
.locals 0
|
||||
|
||||
invoke-direct {p0}, Lcom/firemint/realracing/ServerSelectionActivity;->showServerInputDialog()V
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private loadSavedPreferences()Z
|
||||
.locals 4
|
||||
|
||||
const-string v0, "rr3_server_config"
|
||||
|
||||
const/4 v1, 0x0
|
||||
|
||||
invoke-virtual {p0, v0, v1}, Lcom/firemint/realracing/ServerSelectionActivity;->getSharedPreferences(Ljava/lang/String;I)Landroid/content/SharedPreferences;
|
||||
|
||||
move-result-object v0
|
||||
|
||||
const-string v2, "skip_selection"
|
||||
|
||||
invoke-interface {v0, v2, v1}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
|
||||
|
||||
move-result v2
|
||||
|
||||
if-eqz v2, :cond_0
|
||||
|
||||
const-string v1, "mode"
|
||||
|
||||
const-string v2, "offline"
|
||||
|
||||
invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
|
||||
|
||||
move-result-object v1
|
||||
|
||||
const-string v2, "serverUrl"
|
||||
|
||||
const-string v3, ""
|
||||
|
||||
invoke-interface {v0, v2, v3}, Landroid/content/SharedPreferences;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
|
||||
|
||||
move-result-object v0
|
||||
|
||||
invoke-direct {p0, v1, v0}, Lcom/firemint/realracing/ServerSelectionActivity;->startMainActivity(Ljava/lang/String;Ljava/lang/String;)V
|
||||
|
||||
const/4 v0, 0x1
|
||||
|
||||
return v0
|
||||
|
||||
:cond_0
|
||||
return v1
|
||||
.end method
|
||||
|
||||
.method private showServerInputDialog()V
|
||||
.locals 5
|
||||
|
||||
new-instance v0, Landroid/app/AlertDialog$Builder;
|
||||
|
||||
invoke-direct {v0, p0}, Landroid/app/AlertDialog$Builder;-><init>(Landroid/content/Context;)V
|
||||
|
||||
invoke-virtual {p0}, Lcom/firemint/realracing/ServerSelectionActivity;->getLayoutInflater()Landroid/view/LayoutInflater;
|
||||
|
||||
move-result-object v1
|
||||
|
||||
const v2, 0x7f0d0157
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
invoke-virtual {v1, v2, v3}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;)Landroid/view/View;
|
||||
|
||||
move-result-object v1
|
||||
|
||||
const v2, 0x7f0a047a
|
||||
|
||||
invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
|
||||
|
||||
move-result-object v2
|
||||
|
||||
check-cast v2, Landroid/widget/EditText;
|
||||
|
||||
const v3, 0x7f0a0826
|
||||
|
||||
invoke-virtual {v1, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
|
||||
|
||||
move-result-object v3
|
||||
|
||||
check-cast v3, Landroid/widget/RadioGroup;
|
||||
|
||||
const v4, 0x7f0a0216
|
||||
|
||||
invoke-virtual {v1, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
|
||||
|
||||
move-result-object v4
|
||||
|
||||
check-cast v4, Landroid/widget/CheckBox;
|
||||
|
||||
invoke-virtual {v0, v1}, Landroid/app/AlertDialog$Builder;->setView(Landroid/view/View;)Landroid/app/AlertDialog$Builder;
|
||||
|
||||
new-instance v1, Lcom/firemint/realracing/ServerSelectionActivity$1;
|
||||
|
||||
invoke-direct {v1, p0, v3, v2, v4}, Lcom/firemint/realracing/ServerSelectionActivity$1;-><init>(Lcom/firemint/realracing/ServerSelectionActivity;Landroid/widget/RadioGroup;Landroid/widget/EditText;Landroid/widget/CheckBox;)V
|
||||
|
||||
const-string v2, "Connect"
|
||||
|
||||
invoke-virtual {v0, v2, v1}, Landroid/app/AlertDialog$Builder;->setPositiveButton(Ljava/lang/CharSequence;Landroid/content/DialogInterface$OnClickListener;)Landroid/app/AlertDialog$Builder;
|
||||
|
||||
new-instance v1, Lcom/firemint/realracing/ServerSelectionActivity$2;
|
||||
|
||||
invoke-direct {v1, p0}, Lcom/firemint/realracing/ServerSelectionActivity$2;-><init>(Lcom/firemint/realracing/ServerSelectionActivity;)V
|
||||
|
||||
const-string v2, "Cancel"
|
||||
|
||||
invoke-virtual {v0, v2, v1}, Landroid/app/AlertDialog$Builder;->setNegativeButton(Ljava/lang/CharSequence;Landroid/content/DialogInterface$OnClickListener;)Landroid/app/AlertDialog$Builder;
|
||||
|
||||
const/4 v1, 0x0
|
||||
|
||||
invoke-virtual {v0, v1}, Landroid/app/AlertDialog$Builder;->setCancelable(Z)Landroid/app/AlertDialog$Builder;
|
||||
|
||||
invoke-virtual {v0}, Landroid/app/AlertDialog$Builder;->create()Landroid/app/AlertDialog;
|
||||
|
||||
move-result-object v0
|
||||
|
||||
invoke-virtual {v0}, Landroid/app/AlertDialog;->show()V
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private startMainActivity(Ljava/lang/String;Ljava/lang/String;)V
|
||||
.locals 2
|
||||
|
||||
# First launch UnpackAssetsActivity (extracts game files)
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
const-class v1, Lcom/firemint/realracing/UnpackAssetsActivity;
|
||||
|
||||
invoke-direct {v0, p0, v1}, Landroid/content/Intent;-><init>(Landroid/content/Context;Ljava/lang/Class;)V
|
||||
|
||||
# Pass mode and serverUrl as extras so UnpackAssetsActivity can forward them
|
||||
const-string v1, "mode"
|
||||
|
||||
invoke-virtual {v0, v1, p1}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
|
||||
|
||||
const-string p1, "serverUrl"
|
||||
|
||||
invoke-virtual {v0, p1, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
|
||||
|
||||
invoke-virtual {p0, v0}, Lcom/firemint/realracing/ServerSelectionActivity;->startActivity(Landroid/content/Intent;)V
|
||||
|
||||
invoke-virtual {p0}, Lcom/firemint/realracing/ServerSelectionActivity;->finish()V
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
||||
# virtual methods
|
||||
.method protected onCreate(Landroid/os/Bundle;)V
|
||||
.locals 2
|
||||
|
||||
invoke-super {p0, p1}, Landroid/app/Activity;->onCreate(Landroid/os/Bundle;)V
|
||||
|
||||
invoke-direct {p0}, Lcom/firemint/realracing/ServerSelectionActivity;->loadSavedPreferences()Z
|
||||
|
||||
move-result p1
|
||||
|
||||
if-eqz p1, :cond_0
|
||||
|
||||
return-void
|
||||
|
||||
:cond_0
|
||||
const p1, 0x7f0d001c
|
||||
|
||||
invoke-virtual {p0, p1}, Lcom/firemint/realracing/ServerSelectionActivity;->setContentView(I)V
|
||||
|
||||
const p1, 0x7f0a013a
|
||||
|
||||
invoke-virtual {p0, p1}, Lcom/firemint/realracing/ServerSelectionActivity;->findViewById(I)Landroid/view/View;
|
||||
|
||||
move-result-object p1
|
||||
|
||||
new-instance v0, Lcom/firemint/realracing/ServerSelectionActivity$3;
|
||||
|
||||
invoke-direct {v0, p0}, Lcom/firemint/realracing/ServerSelectionActivity$3;-><init>(Lcom/firemint/realracing/ServerSelectionActivity;)V
|
||||
|
||||
invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
|
||||
|
||||
const p1, 0x7f0a013b
|
||||
|
||||
invoke-virtual {p0, p1}, Lcom/firemint/realracing/ServerSelectionActivity;->findViewById(I)Landroid/view/View;
|
||||
|
||||
move-result-object p1
|
||||
|
||||
new-instance v0, Lcom/firemint/realracing/ServerSelectionActivity$4;
|
||||
|
||||
invoke-direct {v0, p0}, Lcom/firemint/realracing/ServerSelectionActivity$4;-><init>(Lcom/firemint/realracing/ServerSelectionActivity;)V
|
||||
|
||||
invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
|
||||
|
||||
const p1, 0x7f0a0b81
|
||||
|
||||
invoke-virtual {p0, p1}, Lcom/firemint/realracing/ServerSelectionActivity;->findViewById(I)Landroid/view/View;
|
||||
|
||||
move-result-object p1
|
||||
|
||||
new-instance v0, Lcom/firemint/realracing/ServerSelectionActivity$5;
|
||||
|
||||
invoke-direct {v0, p0}, Lcom/firemint/realracing/ServerSelectionActivity$5;-><init>(Lcom/firemint/realracing/ServerSelectionActivity;)V
|
||||
|
||||
invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
|
||||
|
||||
return-void
|
||||
.end method
|
||||
Reference in New Issue
Block a user