This repository was archived by the owner on Apr 19, 2026. It is now read-only.

Fix ButtonClicker random crash issue [ the crash happens on 64 bit gpg sdk ]#20

Closed
ggfan wants to merge 3 commits into from
Closed

Fix ButtonClicker random crash issue [ the crash happens on 64 bit gpg sdk ] #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6afd45
fixing ButtongClicker 64 bit crash problem
ggfan Aug 31, 2015
58e7062
adding check to gpg login when UI is not ready
ggfan Aug 31, 2015
98d0da4
addressing code review issue
ggfan Sep 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions samples-android/ButtonClicker/AndroidManifest.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.example.games.bc3"
package="com.google.example.games.bc"
android:versionCode="1"
android:versionName="1.0" >

<uses-sdk
android:minSdkVersion="11"
android:targetSdkVersion="19" />
android:targetSdkVersion="22" />

<uses-feature android:glEsVersion="0x00020000" >
</uses-feature>
Expand DownExpand Up@@ -47,4 +47,4 @@
</intent-filter>
</activity>
</application>
</manifest>
</manifest>
5 changes: 3 additions & 2 deletions samples-android/ButtonClicker/jni/Application.mk
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
APP_PLATFORM := android-9

@claywilkinsonclaywilkinsonAug 31, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we keep this at 9?

@ggfanggfanSep 1, 2015

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, sure

#APP_ABI := all
APP_ABI := armeabi-v7a
#,arm64-v8a

#APP_ABI:= arm64-v8a
#APP_ABI := all

APP_STL := c++_static

Expand Down
27 changes: 14 additions & 13 deletions samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,15 +105,14 @@ void Engine::InitGooglePlayGameServices() {
*
*/
void Engine::OnAuthActionStarted(gpg::AuthOperation op) {
startup_mutex_.lock();
if (!initialized_resources_) return;

ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, op]() {
EnableUI(false);
authorizing_ = true;
if (op == gpg::AuthOperation::SIGN_IN) {

@claywilkinsonclaywilkinsonAug 31, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you keep the log messages? They help diagnose issues which there always are with authentication.

@ggfanggfanAug 31, 2015

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed a couple of LOG messages from sample to make it clean. when UI is up, it is displayed UI page at the bottom in status_text. so we could make it a little clean in logcat

@claywilkinsonclaywilkinsonSep 2, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But when there is a problem, we ask for a log so we can see what is going on - so now we can't see what is going on. Please put them back.

LOGI("Signing in to GPG");
status_text_->SetAttribute("Text", "Signing In...");
} else {
LOGI("Signing out from GPG");
status_text_->SetAttribute("Text", "Signing Out...");
}
});
Expand All@@ -135,17 +134,19 @@ void Engine::OnAuthActionFinished(gpg::AuthOperation op,
}
});
}

if (!initialized_resources_) return;


if (!initialized_resources_) {
startup_mutex_.unlock();
return;
}
ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, status]() {
EnableUI(true);
authorizing_ = false;
button_sign_in_->SetAttribute(
"Text", gpg::IsSuccess(status) ? "Sign Out" : "Sign In");

status_text_->SetAttribute(
"Text", gpg::IsSuccess(status) ? "Signed In" : "Signed Out");
startup_mutex_.unlock();
});
}

Expand DownExpand Up@@ -560,8 +561,14 @@ void Engine::LeaveGame() {
* invoking jui_helper functions to create java UIs
*/
void Engine::InitUI() {
// The window initialization
jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);

// Show toast with app label
ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([]() {
if(NULL == jui_helper::JUIWindow::GetInstance()->GetContext()) {
return;
}
jui_helper::JUIToast toast(
ndk_helper::JNIHelper::GetInstance()->GetAppLabel());
toast.Show();
Expand All@@ -572,9 +579,6 @@ void Engine::InitUI() {
// UIs.
//

// The window initialization
jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);

//
// Buttons
//
Expand All@@ -586,7 +590,6 @@ void Engine::InitUI() {
jui_helper::LAYOUT_PARAMETER_TRUE);
button_sign_in_->SetCallback([this](jui_helper::JUIView *view,
const int32_t message) {
LOGI("button_sign_in_ click: %d", message);
if (message == jui_helper::JUICALLBACK_BUTTON_UP) {
if (service_->IsAuthorized()) {
service_->SignOut();
Expand DownExpand Up@@ -647,7 +650,6 @@ void Engine::InitUI() {
// Init play game services
InitGooglePlayGameServices();

if (authorizing_) EnableUI(false);
return;
}

Expand All@@ -669,7 +671,6 @@ void Engine::SetParameters(jui_helper::JUIButton *button,
* Enable/Disable management UI
*/
void Engine::EnableUI(bool enable) {
LOGI("Updating UI:%d", enable);
ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, enable]() {
button_sign_in_->SetAttribute("Enabled", enable);

Expand Down
2 changes: 1 addition & 1 deletion samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,13 +147,13 @@ class Engine : public gpg::IRealTimeEventListener {
// in OnRoomStatusChanged()
int32_t score_counter_; // Score counter of local player
bool playing_; // Am I playing a game?
bool authorizing_; // Am I signing in to gpg service?
std::string self_id_; // Local player's ID
double start_time_; // Game start time

// synchronization primitive to synchronize
// UIThread, Timer thread and gpg callback thread
mutable std::mutex mutex_;
mutable std::mutex startup_mutex_;

@claywilkinsonclaywilkinsonAug 31, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add a comment on why 2 mutex are needed? It seems like 1 should be ok?

@ggfanggfanAug 31, 2015

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one is just for start up code: taking conservative way not to make a big change to the existing code.


// Renderer of a teapot
TeapotRenderer renderer_;
Expand Down
4 changes: 2 additions & 2 deletions samples-android/ButtonClicker/jni/ButtonClickerNativeActivity_Engine.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
Engine::Engine()
: initialized_resources_(false),
has_focus_(false),
authorizing_(false),
app_(nullptr),
dialog_(nullptr),
textViewFPS_(nullptr),
Expand DownExpand Up@@ -61,10 +60,12 @@ void Engine::UnloadResources() { renderer_.Unload(); }
*/
int Engine::InitDisplay(const int32_t cmd) {
if (!initialized_resources_) {
startup_mutex_.lock();
gl_context_->Init(app_->window);
InitUI();
LoadResources();
initialized_resources_ = true;
startup_mutex_.unlock();

@claywilkinsonclaywilkinsonAug 31, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you catch exceptions to make sure the mutex gets unlocked?

@ggfanggfanSep 1, 2015

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is good point. if there is exception in native code, it crashes and there is not any catcher here. I think java code handles lot of exceptions; in side native code, I do not see too much yet.

} else {
// initialize OpenGL ES and EGL
if (EGL_SUCCESS != gl_context_->Resume(app_->window)) {
Expand DownExpand Up@@ -192,7 +193,6 @@ int32_t Engine::HandleInput(android_app *app, AInputEvent *event) {
*/
void Engine::HandleCmd(struct android_app *app, int32_t cmd) {
Engine *eng = (Engine *)app->userData;
LOGI("message %d", cmd);
switch (cmd) {
case APP_CMD_SAVE_STATE:
break;
Expand Down
2 changes: 1 addition & 1 deletion samples-android/build_sample.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,7 @@ trap cleanup EXIT
# Copy the lib project and run "android update lib-project" on it.
# This requires a target, which apparently needs to be android-10.
cp -r ${lib_project} ${private_lib}
${android_tool} update lib-project --path ${private_lib} --target android-10
${android_tool} update lib-project --path ${private_lib} --target android-22

#
# At last, build!
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content

This repository was archived by the owner on Apr 19, 2026. It is now read-only.

Fix ButtonClicker random crash issue [ the crash happens on 64 bit gpg sdk ]#20
 Closed

ggfan
wants to merge
3
commits into

from

 Closed


Fix ButtonClicker random crash issue [ the crash happens on 64 bit gpg sdk ]
#20
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a6afd45

fixing ButtongClicker 64 bit crash problem


ggfan Aug 31, 2015
58e7062

adding check to gpg login when UI is not ready


ggfan Aug 31, 2015
98d0da4

addressing code review issue


ggfan Sep 1, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
samples-android/ButtonClicker/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 package="com.google.example.games.bc3"
 package="com.google.example.games.bc"
 android:versionCode="1"
 android:versionName="1.0" >

 <uses-sdk
 android:minSdkVersion="11"
 android:targetSdkVersion="19" />
 android:targetSdkVersion="22" />

 <uses-feature android:glEsVersion="0x00020000" >
 </uses-feature>
Expand DownExpand Up@@ -47,4 +47,4 @@
 </intent-filter>
 </activity>
 </application>
</manifest>
</manifest>

5 changes: 3 additions & 2 deletions
samples-android/ButtonClicker/jni/Application.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
APP_PLATFORM := android-9
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we keep this at 9?
@ggfanggfanSep 1, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, sure
#APP_ABI := all
APP_ABI := armeabi-v7a
#,arm64-v8a

#APP_ABI:= arm64-v8a
#APP_ABI := all

APP_STL := c++_static

Expand Down

27 changes: 14 additions & 13 deletions
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,15 +105,14 @@ void Engine::InitGooglePlayGameServices() {
 *
 */
void Engine::OnAuthActionStarted(gpg::AuthOperation op) {
 startup_mutex_.lock();
 if (!initialized_resources_) return;

 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, op]() {
 EnableUI(false);
 authorizing_ = true;
 if (op == gpg::AuthOperation::SIGN_IN) {
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you keep the log messages? They help diagnose issues which there always are with authentication.
@ggfanggfanAug 31, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed a couple of LOG messages from sample to make it clean. when UI is up, it is displayed UI page at the bottom in status_text. so we could make it a little clean in logcat
@claywilkinsonclaywilkinsonSep 2, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But when there is a problem, we ask for a log so we can see what is going on - so now we can't see what is going on. Please put them back.
 LOGI("Signing in to GPG");
 status_text_->SetAttribute("Text", "Signing In...");
 } else {
 LOGI("Signing out from GPG");
 status_text_->SetAttribute("Text", "Signing Out...");
 }
 });
Expand All@@ -135,17 +134,19 @@ void Engine::OnAuthActionFinished(gpg::AuthOperation op,
 }
 });
 }

 if (!initialized_resources_) return;


 if (!initialized_resources_) {
 startup_mutex_.unlock();
 return;
 }
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, status]() {
 EnableUI(true);
 authorizing_ = false;
 button_sign_in_->SetAttribute(
 "Text", gpg::IsSuccess(status) ? "Sign Out" : "Sign In");

 status_text_->SetAttribute(
 "Text", gpg::IsSuccess(status) ? "Signed In" : "Signed Out");
 startup_mutex_.unlock();
 });
}

Expand DownExpand Up@@ -560,8 +561,14 @@ void Engine::LeaveGame() {
 * invoking jui_helper functions to create java UIs
 */
void Engine::InitUI() {
 // The window initialization
 jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);

 // Show toast with app label
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([]() {
 if(NULL == jui_helper::JUIWindow::GetInstance()->GetContext()) {
 return;
 }
 jui_helper::JUIToast toast(
 ndk_helper::JNIHelper::GetInstance()->GetAppLabel());
 toast.Show();
Expand All@@ -572,9 +579,6 @@ void Engine::InitUI() {
 // UIs.
 //

 // The window initialization
 jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);

 //
 // Buttons
 //
Expand All@@ -586,7 +590,6 @@ void Engine::InitUI() {
 jui_helper::LAYOUT_PARAMETER_TRUE);
 button_sign_in_->SetCallback([this](jui_helper::JUIView *view,
 const int32_t message) {
 LOGI("button_sign_in_ click: %d", message);
 if (message == jui_helper::JUICALLBACK_BUTTON_UP) {
 if (service_->IsAuthorized()) {
 service_->SignOut();
Expand DownExpand Up@@ -647,7 +650,6 @@ void Engine::InitUI() {
 // Init play game services
 InitGooglePlayGameServices();

 if (authorizing_) EnableUI(false);
 return;
}

Expand All@@ -669,7 +671,6 @@ void Engine::SetParameters(jui_helper::JUIButton *button,
 * Enable/Disable management UI
 */
void Engine::EnableUI(bool enable) {
 LOGI("Updating UI:%d", enable);
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, enable]() {
 button_sign_in_->SetAttribute("Enabled", enable);

Expand Down

2 changes: 1 addition & 1 deletion
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,13 +147,13 @@ class Engine : public gpg::IRealTimeEventListener {
 // in OnRoomStatusChanged()
 int32_t score_counter_; // Score counter of local player
 bool playing_; // Am I playing a game?
 bool authorizing_; // Am I signing in to gpg service?
 std::string self_id_; // Local player's ID
 double start_time_; // Game start time

 // synchronization primitive to synchronize
 // UIThread, Timer thread and gpg callback thread
 mutable std::mutex mutex_;
 mutable std::mutex startup_mutex_;
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add a comment on why 2 mutex are needed? It seems like 1 should be ok?
@ggfanggfanAug 31, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one is just for start up code: taking conservative way not to make a big change to the existing code.

 // Renderer of a teapot
 TeapotRenderer renderer_;
Expand Down

4 changes: 2 additions & 2 deletions
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity_Engine.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
Engine::Engine()
 : initialized_resources_(false),
 has_focus_(false),
 authorizing_(false),
 app_(nullptr),
 dialog_(nullptr),
 textViewFPS_(nullptr),
Expand DownExpand Up@@ -61,10 +60,12 @@ void Engine::UnloadResources() { renderer_.Unload(); }
 */
int Engine::InitDisplay(const int32_t cmd) {
 if (!initialized_resources_) {
 startup_mutex_.lock();
 gl_context_->Init(app_->window);
 InitUI();
 LoadResources();
 initialized_resources_ = true;
 startup_mutex_.unlock();
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you catch exceptions to make sure the mutex gets unlocked?
@ggfanggfanSep 1, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is good point. if there is exception in native code, it crashes and there is not any catcher here. I think java code handles lot of exceptions; in side native code, I do not see too much yet.
 } else {
 // initialize OpenGL ES and EGL
 if (EGL_SUCCESS != gl_context_->Resume(app_->window)) {
Expand DownExpand Up@@ -192,7 +193,6 @@ int32_t Engine::HandleInput(android_app *app, AInputEvent *event) {
 */
void Engine::HandleCmd(struct android_app *app, int32_t cmd) {
 Engine *eng = (Engine *)app->userData;
 LOGI("message %d", cmd);
 switch (cmd) {
 case APP_CMD_SAVE_STATE:
 break;
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/build_sample.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,7 @@ trap cleanup EXIT
# Copy the lib project and run "android update lib-project" on it.
# This requires a target, which apparently needs to be android-10.
cp -r ${lib_project} ${private_lib}
${android_tool} update lib-project --path ${private_lib} --target android-10
${android_tool} update lib-project --path ${private_lib} --target android-22

#
# At last, build!
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Apr 19, 2026. It is now read-only.

Fix ButtonClicker random crash issue [ the crash happens on 64 bit gpg sdk ]#20
 Closed

ggfan
wants to merge
3
commits into

from

 Closed


Fix ButtonClicker random crash issue [ the crash happens on 64 bit gpg sdk ]
#20
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a6afd45

fixing ButtongClicker 64 bit crash problem


ggfan Aug 31, 2015
58e7062

adding check to gpg login when UI is not ready


ggfan Aug 31, 2015
98d0da4

addressing code review issue


ggfan Sep 1, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
samples-android/ButtonClicker/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 package="com.google.example.games.bc3"
 package="com.google.example.games.bc"
 android:versionCode="1"
 android:versionName="1.0" >

 <uses-sdk
 android:minSdkVersion="11"
 android:targetSdkVersion="19" />
 android:targetSdkVersion="22" />

 <uses-feature android:glEsVersion="0x00020000" >
 </uses-feature>
Expand DownExpand Up@@ -47,4 +47,4 @@
 </intent-filter>
 </activity>
 </application>
</manifest>
</manifest>

5 changes: 3 additions & 2 deletions
samples-android/ButtonClicker/jni/Application.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
APP_PLATFORM := android-9
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we keep this at 9?
@ggfanggfanSep 1, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, sure
#APP_ABI := all
APP_ABI := armeabi-v7a
#,arm64-v8a

#APP_ABI:= arm64-v8a
#APP_ABI := all

APP_STL := c++_static

Expand Down

27 changes: 14 additions & 13 deletions
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,15 +105,14 @@ void Engine::InitGooglePlayGameServices() {
 *
 */
void Engine::OnAuthActionStarted(gpg::AuthOperation op) {
 startup_mutex_.lock();
 if (!initialized_resources_) return;

 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, op]() {
 EnableUI(false);
 authorizing_ = true;
 if (op == gpg::AuthOperation::SIGN_IN) {
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you keep the log messages? They help diagnose issues which there always are with authentication.
@ggfanggfanAug 31, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed a couple of LOG messages from sample to make it clean. when UI is up, it is displayed UI page at the bottom in status_text. so we could make it a little clean in logcat
@claywilkinsonclaywilkinsonSep 2, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But when there is a problem, we ask for a log so we can see what is going on - so now we can't see what is going on. Please put them back.
 LOGI("Signing in to GPG");
 status_text_->SetAttribute("Text", "Signing In...");
 } else {
 LOGI("Signing out from GPG");
 status_text_->SetAttribute("Text", "Signing Out...");
 }
 });
Expand All@@ -135,17 +134,19 @@ void Engine::OnAuthActionFinished(gpg::AuthOperation op,
 }
 });
 }

 if (!initialized_resources_) return;


 if (!initialized_resources_) {
 startup_mutex_.unlock();
 return;
 }
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, status]() {
 EnableUI(true);
 authorizing_ = false;
 button_sign_in_->SetAttribute(
 "Text", gpg::IsSuccess(status) ? "Sign Out" : "Sign In");

 status_text_->SetAttribute(
 "Text", gpg::IsSuccess(status) ? "Signed In" : "Signed Out");
 startup_mutex_.unlock();
 });
}

Expand DownExpand Up@@ -560,8 +561,14 @@ void Engine::LeaveGame() {
 * invoking jui_helper functions to create java UIs
 */
void Engine::InitUI() {
 // The window initialization
 jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);

 // Show toast with app label
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([]() {
 if(NULL == jui_helper::JUIWindow::GetInstance()->GetContext()) {
 return;
 }
 jui_helper::JUIToast toast(
 ndk_helper::JNIHelper::GetInstance()->GetAppLabel());
 toast.Show();
Expand All@@ -572,9 +579,6 @@ void Engine::InitUI() {
 // UIs.
 //

 // The window initialization
 jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);

 //
 // Buttons
 //
Expand All@@ -586,7 +590,6 @@ void Engine::InitUI() {
 jui_helper::LAYOUT_PARAMETER_TRUE);
 button_sign_in_->SetCallback([this](jui_helper::JUIView *view,
 const int32_t message) {
 LOGI("button_sign_in_ click: %d", message);
 if (message == jui_helper::JUICALLBACK_BUTTON_UP) {
 if (service_->IsAuthorized()) {
 service_->SignOut();
Expand DownExpand Up@@ -647,7 +650,6 @@ void Engine::InitUI() {
 // Init play game services
 InitGooglePlayGameServices();

 if (authorizing_) EnableUI(false);
 return;
}

Expand All@@ -669,7 +671,6 @@ void Engine::SetParameters(jui_helper::JUIButton *button,
 * Enable/Disable management UI
 */
void Engine::EnableUI(bool enable) {
 LOGI("Updating UI:%d", enable);
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, enable]() {
 button_sign_in_->SetAttribute("Enabled", enable);

Expand Down

2 changes: 1 addition & 1 deletion
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,13 +147,13 @@ class Engine : public gpg::IRealTimeEventListener {
 // in OnRoomStatusChanged()
 int32_t score_counter_; // Score counter of local player
 bool playing_; // Am I playing a game?
 bool authorizing_; // Am I signing in to gpg service?
 std::string self_id_; // Local player's ID
 double start_time_; // Game start time

 // synchronization primitive to synchronize
 // UIThread, Timer thread and gpg callback thread
 mutable std::mutex mutex_;
 mutable std::mutex startup_mutex_;
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add a comment on why 2 mutex are needed? It seems like 1 should be ok?
@ggfanggfanAug 31, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one is just for start up code: taking conservative way not to make a big change to the existing code.

 // Renderer of a teapot
 TeapotRenderer renderer_;
Expand Down

4 changes: 2 additions & 2 deletions
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity_Engine.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
Engine::Engine()
 : initialized_resources_(false),
 has_focus_(false),
 authorizing_(false),
 app_(nullptr),
 dialog_(nullptr),
 textViewFPS_(nullptr),
Expand DownExpand Up@@ -61,10 +60,12 @@ void Engine::UnloadResources() { renderer_.Unload(); }
 */
int Engine::InitDisplay(const int32_t cmd) {
 if (!initialized_resources_) {
 startup_mutex_.lock();
 gl_context_->Init(app_->window);
 InitUI();
 LoadResources();
 initialized_resources_ = true;
 startup_mutex_.unlock();
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you catch exceptions to make sure the mutex gets unlocked?
@ggfanggfanSep 1, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is good point. if there is exception in native code, it crashes and there is not any catcher here. I think java code handles lot of exceptions; in side native code, I do not see too much yet.
 } else {
 // initialize OpenGL ES and EGL
 if (EGL_SUCCESS != gl_context_->Resume(app_->window)) {
Expand DownExpand Up@@ -192,7 +193,6 @@ int32_t Engine::HandleInput(android_app *app, AInputEvent *event) {
 */
void Engine::HandleCmd(struct android_app *app, int32_t cmd) {
 Engine *eng = (Engine *)app->userData;
 LOGI("message %d", cmd);
 switch (cmd) {
 case APP_CMD_SAVE_STATE:
 break;
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/build_sample.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,7 @@ trap cleanup EXIT
# Copy the lib project and run "android update lib-project" on it.
# This requires a target, which apparently needs to be android-10.
cp -r ${lib_project} ${private_lib}
${android_tool} update lib-project --path ${private_lib} --target android-10
${android_tool} update lib-project --path ${private_lib} --target android-22

#
# At last, build!
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Apr 19, 2026. It is now read-only.

Fix ButtonClicker random crash issue [ the crash happens on 64 bit gpg sdk ]#20
 Closed

ggfan
wants to merge
3
commits into

from

 Closed


Fix ButtonClicker random crash issue [ the crash happens on 64 bit gpg sdk ]
#20
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a6afd45

fixing ButtongClicker 64 bit crash problem


ggfan Aug 31, 2015
58e7062

adding check to gpg login when UI is not ready


ggfan Aug 31, 2015
98d0da4

addressing code review issue


ggfan Sep 1, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
samples-android/ButtonClicker/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 package="com.google.example.games.bc3"
 package="com.google.example.games.bc"
 android:versionCode="1"
 android:versionName="1.0" >

 <uses-sdk
 android:minSdkVersion="11"
 android:targetSdkVersion="19" />
 android:targetSdkVersion="22" />

 <uses-feature android:glEsVersion="0x00020000" >
 </uses-feature>
Expand DownExpand Up@@ -47,4 +47,4 @@
 </intent-filter>
 </activity>
 </application>
</manifest>
</manifest>

5 changes: 3 additions & 2 deletions
samples-android/ButtonClicker/jni/Application.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
APP_PLATFORM := android-9
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we keep this at 9?
@ggfanggfanSep 1, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, sure
#APP_ABI := all
APP_ABI := armeabi-v7a
#,arm64-v8a

#APP_ABI:= arm64-v8a
#APP_ABI := all

APP_STL := c++_static

Expand Down

27 changes: 14 additions & 13 deletions
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,15 +105,14 @@ void Engine::InitGooglePlayGameServices() {
 *
 */
void Engine::OnAuthActionStarted(gpg::AuthOperation op) {
 startup_mutex_.lock();
 if (!initialized_resources_) return;

 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, op]() {
 EnableUI(false);
 authorizing_ = true;
 if (op == gpg::AuthOperation::SIGN_IN) {
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you keep the log messages? They help diagnose issues which there always are with authentication.
@ggfanggfanAug 31, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed a couple of LOG messages from sample to make it clean. when UI is up, it is displayed UI page at the bottom in status_text. so we could make it a little clean in logcat
@claywilkinsonclaywilkinsonSep 2, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But when there is a problem, we ask for a log so we can see what is going on - so now we can't see what is going on. Please put them back.
 LOGI("Signing in to GPG");
 status_text_->SetAttribute("Text", "Signing In...");
 } else {
 LOGI("Signing out from GPG");
 status_text_->SetAttribute("Text", "Signing Out...");
 }
 });
Expand All@@ -135,17 +134,19 @@ void Engine::OnAuthActionFinished(gpg::AuthOperation op,
 }
 });
 }

 if (!initialized_resources_) return;


 if (!initialized_resources_) {
 startup_mutex_.unlock();
 return;
 }
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, status]() {
 EnableUI(true);
 authorizing_ = false;
 button_sign_in_->SetAttribute(
 "Text", gpg::IsSuccess(status) ? "Sign Out" : "Sign In");

 status_text_->SetAttribute(
 "Text", gpg::IsSuccess(status) ? "Signed In" : "Signed Out");
 startup_mutex_.unlock();
 });
}

Expand DownExpand Up@@ -560,8 +561,14 @@ void Engine::LeaveGame() {
 * invoking jui_helper functions to create java UIs
 */
void Engine::InitUI() {
 // The window initialization
 jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);

 // Show toast with app label
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([]() {
 if(NULL == jui_helper::JUIWindow::GetInstance()->GetContext()) {
 return;
 }
 jui_helper::JUIToast toast(
 ndk_helper::JNIHelper::GetInstance()->GetAppLabel());
 toast.Show();
Expand All@@ -572,9 +579,6 @@ void Engine::InitUI() {
 // UIs.
 //

 // The window initialization
 jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);

 //
 // Buttons
 //
Expand All@@ -586,7 +590,6 @@ void Engine::InitUI() {
 jui_helper::LAYOUT_PARAMETER_TRUE);
 button_sign_in_->SetCallback([this](jui_helper::JUIView *view,
 const int32_t message) {
 LOGI("button_sign_in_ click: %d", message);
 if (message == jui_helper::JUICALLBACK_BUTTON_UP) {
 if (service_->IsAuthorized()) {
 service_->SignOut();
Expand DownExpand Up@@ -647,7 +650,6 @@ void Engine::InitUI() {
 // Init play game services
 InitGooglePlayGameServices();

 if (authorizing_) EnableUI(false);
 return;
}

Expand All@@ -669,7 +671,6 @@ void Engine::SetParameters(jui_helper::JUIButton *button,
 * Enable/Disable management UI
 */
void Engine::EnableUI(bool enable) {
 LOGI("Updating UI:%d", enable);
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, enable]() {
 button_sign_in_->SetAttribute("Enabled", enable);

Expand Down

2 changes: 1 addition & 1 deletion
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,13 +147,13 @@ class Engine : public gpg::IRealTimeEventListener {
 // in OnRoomStatusChanged()
 int32_t score_counter_; // Score counter of local player
 bool playing_; // Am I playing a game?
 bool authorizing_; // Am I signing in to gpg service?
 std::string self_id_; // Local player's ID
 double start_time_; // Game start time

 // synchronization primitive to synchronize
 // UIThread, Timer thread and gpg callback thread
 mutable std::mutex mutex_;
 mutable std::mutex startup_mutex_;
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add a comment on why 2 mutex are needed? It seems like 1 should be ok?
@ggfanggfanAug 31, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one is just for start up code: taking conservative way not to make a big change to the existing code.

 // Renderer of a teapot
 TeapotRenderer renderer_;
Expand Down

4 changes: 2 additions & 2 deletions
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity_Engine.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
Engine::Engine()
 : initialized_resources_(false),
 has_focus_(false),
 authorizing_(false),
 app_(nullptr),
 dialog_(nullptr),
 textViewFPS_(nullptr),
Expand DownExpand Up@@ -61,10 +60,12 @@ void Engine::UnloadResources() { renderer_.Unload(); }
 */
int Engine::InitDisplay(const int32_t cmd) {
 if (!initialized_resources_) {
 startup_mutex_.lock();
 gl_context_->Init(app_->window);
 InitUI();
 LoadResources();
 initialized_resources_ = true;
 startup_mutex_.unlock();
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you catch exceptions to make sure the mutex gets unlocked?
@ggfanggfanSep 1, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is good point. if there is exception in native code, it crashes and there is not any catcher here. I think java code handles lot of exceptions; in side native code, I do not see too much yet.
 } else {
 // initialize OpenGL ES and EGL
 if (EGL_SUCCESS != gl_context_->Resume(app_->window)) {
Expand DownExpand Up@@ -192,7 +193,6 @@ int32_t Engine::HandleInput(android_app *app, AInputEvent *event) {
 */
void Engine::HandleCmd(struct android_app *app, int32_t cmd) {
 Engine *eng = (Engine *)app->userData;
 LOGI("message %d", cmd);
 switch (cmd) {
 case APP_CMD_SAVE_STATE:
 break;
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/build_sample.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,7 @@ trap cleanup EXIT
# Copy the lib project and run "android update lib-project" on it.
# This requires a target, which apparently needs to be android-10.
cp -r ${lib_project} ${private_lib}
${android_tool} update lib-project --path ${private_lib} --target android-10
${android_tool} update lib-project --path ${private_lib} --target android-22

#
# At last, build!
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content

This repository was archived by the owner on Apr 19, 2026. It is now read-only.

Fix ButtonClicker random crash issue [ the crash happens on 64 bit gpg sdk ]#20
 Closed

ggfan
wants to merge
3
commits into

from

 Closed


Fix ButtonClicker random crash issue [ the crash happens on 64 bit gpg sdk ]
#20
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a6afd45

fixing ButtongClicker 64 bit crash problem


ggfan Aug 31, 2015
58e7062

adding check to gpg login when UI is not ready


ggfan Aug 31, 2015
98d0da4

addressing code review issue


ggfan Sep 1, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
samples-android/ButtonClicker/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 package="com.google.example.games.bc3"
 package="com.google.example.games.bc"
 android:versionCode="1"
 android:versionName="1.0" >

 <uses-sdk
 android:minSdkVersion="11"
 android:targetSdkVersion="19" />
 android:targetSdkVersion="22" />

 <uses-feature android:glEsVersion="0x00020000" >
 </uses-feature>
Expand DownExpand Up@@ -47,4 +47,4 @@
 </intent-filter>
 </activity>
 </application>
</manifest>
</manifest>

5 changes: 3 additions & 2 deletions
samples-android/ButtonClicker/jni/Application.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
APP_PLATFORM := android-9
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we keep this at 9?
@ggfanggfanSep 1, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, sure
#APP_ABI := all
APP_ABI := armeabi-v7a
#,arm64-v8a

#APP_ABI:= arm64-v8a
#APP_ABI := all

APP_STL := c++_static

Expand Down

27 changes: 14 additions & 13 deletions
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,15 +105,14 @@ void Engine::InitGooglePlayGameServices() {
 *
 */
void Engine::OnAuthActionStarted(gpg::AuthOperation op) {
 startup_mutex_.lock();
 if (!initialized_resources_) return;

 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, op]() {
 EnableUI(false);
 authorizing_ = true;
 if (op == gpg::AuthOperation::SIGN_IN) {
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you keep the log messages? They help diagnose issues which there always are with authentication.
@ggfanggfanAug 31, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed a couple of LOG messages from sample to make it clean. when UI is up, it is displayed UI page at the bottom in status_text. so we could make it a little clean in logcat
@claywilkinsonclaywilkinsonSep 2, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But when there is a problem, we ask for a log so we can see what is going on - so now we can't see what is going on. Please put them back.
 LOGI("Signing in to GPG");
 status_text_->SetAttribute("Text", "Signing In...");
 } else {
 LOGI("Signing out from GPG");
 status_text_->SetAttribute("Text", "Signing Out...");
 }
 });
Expand All@@ -135,17 +134,19 @@ void Engine::OnAuthActionFinished(gpg::AuthOperation op,
 }
 });
 }

 if (!initialized_resources_) return;


 if (!initialized_resources_) {
 startup_mutex_.unlock();
 return;
 }
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, status]() {
 EnableUI(true);
 authorizing_ = false;
 button_sign_in_->SetAttribute(
 "Text", gpg::IsSuccess(status) ? "Sign Out" : "Sign In");

 status_text_->SetAttribute(
 "Text", gpg::IsSuccess(status) ? "Signed In" : "Signed Out");
 startup_mutex_.unlock();
 });
}

Expand DownExpand Up@@ -560,8 +561,14 @@ void Engine::LeaveGame() {
 * invoking jui_helper functions to create java UIs
 */
void Engine::InitUI() {
 // The window initialization
 jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);

 // Show toast with app label
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([]() {
 if(NULL == jui_helper::JUIWindow::GetInstance()->GetContext()) {
 return;
 }
 jui_helper::JUIToast toast(
 ndk_helper::JNIHelper::GetInstance()->GetAppLabel());
 toast.Show();
Expand All@@ -572,9 +579,6 @@ void Engine::InitUI() {
 // UIs.
 //

 // The window initialization
 jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);

 //
 // Buttons
 //
Expand All@@ -586,7 +590,6 @@ void Engine::InitUI() {
 jui_helper::LAYOUT_PARAMETER_TRUE);
 button_sign_in_->SetCallback([this](jui_helper::JUIView *view,
 const int32_t message) {
 LOGI("button_sign_in_ click: %d", message);
 if (message == jui_helper::JUICALLBACK_BUTTON_UP) {
 if (service_->IsAuthorized()) {
 service_->SignOut();
Expand DownExpand Up@@ -647,7 +650,6 @@ void Engine::InitUI() {
 // Init play game services
 InitGooglePlayGameServices();

 if (authorizing_) EnableUI(false);
 return;
}

Expand All@@ -669,7 +671,6 @@ void Engine::SetParameters(jui_helper::JUIButton *button,
 * Enable/Disable management UI
 */
void Engine::EnableUI(bool enable) {
 LOGI("Updating UI:%d", enable);
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, enable]() {
 button_sign_in_->SetAttribute("Enabled", enable);

Expand Down

2 changes: 1 addition & 1 deletion
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,13 +147,13 @@ class Engine : public gpg::IRealTimeEventListener {
 // in OnRoomStatusChanged()
 int32_t score_counter_; // Score counter of local player
 bool playing_; // Am I playing a game?
 bool authorizing_; // Am I signing in to gpg service?
 std::string self_id_; // Local player's ID
 double start_time_; // Game start time

 // synchronization primitive to synchronize
 // UIThread, Timer thread and gpg callback thread
 mutable std::mutex mutex_;
 mutable std::mutex startup_mutex_;
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add a comment on why 2 mutex are needed? It seems like 1 should be ok?
@ggfanggfanAug 31, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one is just for start up code: taking conservative way not to make a big change to the existing code.

 // Renderer of a teapot
 TeapotRenderer renderer_;
Expand Down

4 changes: 2 additions & 2 deletions
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity_Engine.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
Engine::Engine()
 : initialized_resources_(false),
 has_focus_(false),
 authorizing_(false),
 app_(nullptr),
 dialog_(nullptr),
 textViewFPS_(nullptr),
Expand DownExpand Up@@ -61,10 +60,12 @@ void Engine::UnloadResources() { renderer_.Unload(); }
 */
int Engine::InitDisplay(const int32_t cmd) {
 if (!initialized_resources_) {
 startup_mutex_.lock();
 gl_context_->Init(app_->window);
 InitUI();
 LoadResources();
 initialized_resources_ = true;
 startup_mutex_.unlock();
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you catch exceptions to make sure the mutex gets unlocked?
@ggfanggfanSep 1, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is good point. if there is exception in native code, it crashes and there is not any catcher here. I think java code handles lot of exceptions; in side native code, I do not see too much yet.
 } else {
 // initialize OpenGL ES and EGL
 if (EGL_SUCCESS != gl_context_->Resume(app_->window)) {
Expand DownExpand Up@@ -192,7 +193,6 @@ int32_t Engine::HandleInput(android_app *app, AInputEvent *event) {
 */
void Engine::HandleCmd(struct android_app *app, int32_t cmd) {
 Engine *eng = (Engine *)app->userData;
 LOGI("message %d", cmd);
 switch (cmd) {
 case APP_CMD_SAVE_STATE:
 break;
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/build_sample.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,7 @@ trap cleanup EXIT
# Copy the lib project and run "android update lib-project" on it.
# This requires a target, which apparently needs to be android-10.
cp -r ${lib_project} ${private_lib}
${android_tool} update lib-project --path ${private_lib} --target android-10
${android_tool} update lib-project --path ${private_lib} --target android-22

#
# At last, build!
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Apr 19, 2026. It is now read-only.

Fix ButtonClicker random crash issue [ the crash happens on 64 bit gpg sdk ]#20
 Closed

ggfan
wants to merge
3
commits into

from

 Closed


Fix ButtonClicker random crash issue [ the crash happens on 64 bit gpg sdk ]
#20
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a6afd45

fixing ButtongClicker 64 bit crash problem


ggfan Aug 31, 2015
58e7062

adding check to gpg login when UI is not ready


ggfan Aug 31, 2015
98d0da4

addressing code review issue


ggfan Sep 1, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
samples-android/ButtonClicker/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 package="com.google.example.games.bc3"
 package="com.google.example.games.bc"
 android:versionCode="1"
 android:versionName="1.0" >

 <uses-sdk
 android:minSdkVersion="11"
 android:targetSdkVersion="19" />
 android:targetSdkVersion="22" />

 <uses-feature android:glEsVersion="0x00020000" >
 </uses-feature>
Expand DownExpand Up@@ -47,4 +47,4 @@
 </intent-filter>
 </activity>
 </application>
</manifest>
</manifest>

5 changes: 3 additions & 2 deletions
samples-android/ButtonClicker/jni/Application.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
APP_PLATFORM := android-9
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we keep this at 9?
@ggfanggfanSep 1, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, sure
#APP_ABI := all
APP_ABI := armeabi-v7a
#,arm64-v8a

#APP_ABI:= arm64-v8a
#APP_ABI := all

APP_STL := c++_static

Expand Down

27 changes: 14 additions & 13 deletions
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,15 +105,14 @@ void Engine::InitGooglePlayGameServices() {
 *
 */
void Engine::OnAuthActionStarted(gpg::AuthOperation op) {
 startup_mutex_.lock();
 if (!initialized_resources_) return;

 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, op]() {
 EnableUI(false);
 authorizing_ = true;
 if (op == gpg::AuthOperation::SIGN_IN) {
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you keep the log messages? They help diagnose issues which there always are with authentication.
@ggfanggfanAug 31, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed a couple of LOG messages from sample to make it clean. when UI is up, it is displayed UI page at the bottom in status_text. so we could make it a little clean in logcat
@claywilkinsonclaywilkinsonSep 2, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But when there is a problem, we ask for a log so we can see what is going on - so now we can't see what is going on. Please put them back.
 LOGI("Signing in to GPG");
 status_text_->SetAttribute("Text", "Signing In...");
 } else {
 LOGI("Signing out from GPG");
 status_text_->SetAttribute("Text", "Signing Out...");
 }
 });
Expand All@@ -135,17 +134,19 @@ void Engine::OnAuthActionFinished(gpg::AuthOperation op,
 }
 });
 }

 if (!initialized_resources_) return;


 if (!initialized_resources_) {
 startup_mutex_.unlock();
 return;
 }
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, status]() {
 EnableUI(true);
 authorizing_ = false;
 button_sign_in_->SetAttribute(
 "Text", gpg::IsSuccess(status) ? "Sign Out" : "Sign In");

 status_text_->SetAttribute(
 "Text", gpg::IsSuccess(status) ? "Signed In" : "Signed Out");
 startup_mutex_.unlock();
 });
}

Expand DownExpand Up@@ -560,8 +561,14 @@ void Engine::LeaveGame() {
 * invoking jui_helper functions to create java UIs
 */
void Engine::InitUI() {
 // The window initialization
 jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);

 // Show toast with app label
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([]() {
 if(NULL == jui_helper::JUIWindow::GetInstance()->GetContext()) {
 return;
 }
 jui_helper::JUIToast toast(
 ndk_helper::JNIHelper::GetInstance()->GetAppLabel());
 toast.Show();
Expand All@@ -572,9 +579,6 @@ void Engine::InitUI() {
 // UIs.
 //

 // The window initialization
 jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);

 //
 // Buttons
 //
Expand All@@ -586,7 +590,6 @@ void Engine::InitUI() {
 jui_helper::LAYOUT_PARAMETER_TRUE);
 button_sign_in_->SetCallback([this](jui_helper::JUIView *view,
 const int32_t message) {
 LOGI("button_sign_in_ click: %d", message);
 if (message == jui_helper::JUICALLBACK_BUTTON_UP) {
 if (service_->IsAuthorized()) {
 service_->SignOut();
Expand DownExpand Up@@ -647,7 +650,6 @@ void Engine::InitUI() {
 // Init play game services
 InitGooglePlayGameServices();

 if (authorizing_) EnableUI(false);
 return;
}

Expand All@@ -669,7 +671,6 @@ void Engine::SetParameters(jui_helper::JUIButton *button,
 * Enable/Disable management UI
 */
void Engine::EnableUI(bool enable) {
 LOGI("Updating UI:%d", enable);
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, enable]() {
 button_sign_in_->SetAttribute("Enabled", enable);

Expand Down

2 changes: 1 addition & 1 deletion
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,13 +147,13 @@ class Engine : public gpg::IRealTimeEventListener {
 // in OnRoomStatusChanged()
 int32_t score_counter_; // Score counter of local player
 bool playing_; // Am I playing a game?
 bool authorizing_; // Am I signing in to gpg service?
 std::string self_id_; // Local player's ID
 double start_time_; // Game start time

 // synchronization primitive to synchronize
 // UIThread, Timer thread and gpg callback thread
 mutable std::mutex mutex_;
 mutable std::mutex startup_mutex_;
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add a comment on why 2 mutex are needed? It seems like 1 should be ok?
@ggfanggfanAug 31, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one is just for start up code: taking conservative way not to make a big change to the existing code.

 // Renderer of a teapot
 TeapotRenderer renderer_;
Expand Down

4 changes: 2 additions & 2 deletions
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity_Engine.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
Engine::Engine()
 : initialized_resources_(false),
 has_focus_(false),
 authorizing_(false),
 app_(nullptr),
 dialog_(nullptr),
 textViewFPS_(nullptr),
Expand DownExpand Up@@ -61,10 +60,12 @@ void Engine::UnloadResources() { renderer_.Unload(); }
 */
int Engine::InitDisplay(const int32_t cmd) {
 if (!initialized_resources_) {
 startup_mutex_.lock();
 gl_context_->Init(app_->window);
 InitUI();
 LoadResources();
 initialized_resources_ = true;
 startup_mutex_.unlock();
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you catch exceptions to make sure the mutex gets unlocked?
@ggfanggfanSep 1, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is good point. if there is exception in native code, it crashes and there is not any catcher here. I think java code handles lot of exceptions; in side native code, I do not see too much yet.
 } else {
 // initialize OpenGL ES and EGL
 if (EGL_SUCCESS != gl_context_->Resume(app_->window)) {
Expand DownExpand Up@@ -192,7 +193,6 @@ int32_t Engine::HandleInput(android_app *app, AInputEvent *event) {
 */
void Engine::HandleCmd(struct android_app *app, int32_t cmd) {
 Engine *eng = (Engine *)app->userData;
 LOGI("message %d", cmd);
 switch (cmd) {
 case APP_CMD_SAVE_STATE:
 break;
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/build_sample.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,7 @@ trap cleanup EXIT
# Copy the lib project and run "android update lib-project" on it.
# This requires a target, which apparently needs to be android-10.
cp -r ${lib_project} ${private_lib}
${android_tool} update lib-project --path ${private_lib} --target android-10
${android_tool} update lib-project --path ${private_lib} --target android-22

#
# At last, build!
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Apr 19, 2026. It is now read-only.

Fix ButtonClicker random crash issue [ the crash happens on 64 bit gpg sdk ]#20
 Closed

ggfan
wants to merge
3
commits into

from

 Closed


Fix ButtonClicker random crash issue [ the crash happens on 64 bit gpg sdk ]
#20
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a6afd45

fixing ButtongClicker 64 bit crash problem


ggfan Aug 31, 2015
58e7062

adding check to gpg login when UI is not ready


ggfan Aug 31, 2015
98d0da4

addressing code review issue


ggfan Sep 1, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
samples-android/ButtonClicker/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 package="com.google.example.games.bc3"
 package="com.google.example.games.bc"
 android:versionCode="1"
 android:versionName="1.0" >

 <uses-sdk
 android:minSdkVersion="11"
 android:targetSdkVersion="19" />
 android:targetSdkVersion="22" />

 <uses-feature android:glEsVersion="0x00020000" >
 </uses-feature>
Expand DownExpand Up@@ -47,4 +47,4 @@
 </intent-filter>
 </activity>
 </application>
</manifest>
</manifest>

5 changes: 3 additions & 2 deletions
samples-android/ButtonClicker/jni/Application.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
APP_PLATFORM := android-9
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we keep this at 9?
@ggfanggfanSep 1, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, sure
#APP_ABI := all
APP_ABI := armeabi-v7a
#,arm64-v8a

#APP_ABI:= arm64-v8a
#APP_ABI := all

APP_STL := c++_static

Expand Down

27 changes: 14 additions & 13 deletions
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,15 +105,14 @@ void Engine::InitGooglePlayGameServices() {
 *
 */
void Engine::OnAuthActionStarted(gpg::AuthOperation op) {
 startup_mutex_.lock();
 if (!initialized_resources_) return;

 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, op]() {
 EnableUI(false);
 authorizing_ = true;
 if (op == gpg::AuthOperation::SIGN_IN) {
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you keep the log messages? They help diagnose issues which there always are with authentication.
@ggfanggfanAug 31, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed a couple of LOG messages from sample to make it clean. when UI is up, it is displayed UI page at the bottom in status_text. so we could make it a little clean in logcat
@claywilkinsonclaywilkinsonSep 2, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But when there is a problem, we ask for a log so we can see what is going on - so now we can't see what is going on. Please put them back.
 LOGI("Signing in to GPG");
 status_text_->SetAttribute("Text", "Signing In...");
 } else {
 LOGI("Signing out from GPG");
 status_text_->SetAttribute("Text", "Signing Out...");
 }
 });
Expand All@@ -135,17 +134,19 @@ void Engine::OnAuthActionFinished(gpg::AuthOperation op,
 }
 });
 }

 if (!initialized_resources_) return;


 if (!initialized_resources_) {
 startup_mutex_.unlock();
 return;
 }
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, status]() {
 EnableUI(true);
 authorizing_ = false;
 button_sign_in_->SetAttribute(
 "Text", gpg::IsSuccess(status) ? "Sign Out" : "Sign In");

 status_text_->SetAttribute(
 "Text", gpg::IsSuccess(status) ? "Signed In" : "Signed Out");
 startup_mutex_.unlock();
 });
}

Expand DownExpand Up@@ -560,8 +561,14 @@ void Engine::LeaveGame() {
 * invoking jui_helper functions to create java UIs
 */
void Engine::InitUI() {
 // The window initialization
 jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);

 // Show toast with app label
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([]() {
 if(NULL == jui_helper::JUIWindow::GetInstance()->GetContext()) {
 return;
 }
 jui_helper::JUIToast toast(
 ndk_helper::JNIHelper::GetInstance()->GetAppLabel());
 toast.Show();
Expand All@@ -572,9 +579,6 @@ void Engine::InitUI() {
 // UIs.
 //

 // The window initialization
 jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);

 //
 // Buttons
 //
Expand All@@ -586,7 +590,6 @@ void Engine::InitUI() {
 jui_helper::LAYOUT_PARAMETER_TRUE);
 button_sign_in_->SetCallback([this](jui_helper::JUIView *view,
 const int32_t message) {
 LOGI("button_sign_in_ click: %d", message);
 if (message == jui_helper::JUICALLBACK_BUTTON_UP) {
 if (service_->IsAuthorized()) {
 service_->SignOut();
Expand DownExpand Up@@ -647,7 +650,6 @@ void Engine::InitUI() {
 // Init play game services
 InitGooglePlayGameServices();

 if (authorizing_) EnableUI(false);
 return;
}

Expand All@@ -669,7 +671,6 @@ void Engine::SetParameters(jui_helper::JUIButton *button,
 * Enable/Disable management UI
 */
void Engine::EnableUI(bool enable) {
 LOGI("Updating UI:%d", enable);
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, enable]() {
 button_sign_in_->SetAttribute("Enabled", enable);

Expand Down

2 changes: 1 addition & 1 deletion
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,13 +147,13 @@ class Engine : public gpg::IRealTimeEventListener {
 // in OnRoomStatusChanged()
 int32_t score_counter_; // Score counter of local player
 bool playing_; // Am I playing a game?
 bool authorizing_; // Am I signing in to gpg service?
 std::string self_id_; // Local player's ID
 double start_time_; // Game start time

 // synchronization primitive to synchronize
 // UIThread, Timer thread and gpg callback thread
 mutable std::mutex mutex_;
 mutable std::mutex startup_mutex_;
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add a comment on why 2 mutex are needed? It seems like 1 should be ok?
@ggfanggfanAug 31, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one is just for start up code: taking conservative way not to make a big change to the existing code.

 // Renderer of a teapot
 TeapotRenderer renderer_;
Expand Down

4 changes: 2 additions & 2 deletions
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity_Engine.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
Engine::Engine()
 : initialized_resources_(false),
 has_focus_(false),
 authorizing_(false),
 app_(nullptr),
 dialog_(nullptr),
 textViewFPS_(nullptr),
Expand DownExpand Up@@ -61,10 +60,12 @@ void Engine::UnloadResources() { renderer_.Unload(); }
 */
int Engine::InitDisplay(const int32_t cmd) {
 if (!initialized_resources_) {
 startup_mutex_.lock();
 gl_context_->Init(app_->window);
 InitUI();
 LoadResources();
 initialized_resources_ = true;
 startup_mutex_.unlock();
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you catch exceptions to make sure the mutex gets unlocked?
@ggfanggfanSep 1, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is good point. if there is exception in native code, it crashes and there is not any catcher here. I think java code handles lot of exceptions; in side native code, I do not see too much yet.
 } else {
 // initialize OpenGL ES and EGL
 if (EGL_SUCCESS != gl_context_->Resume(app_->window)) {
Expand DownExpand Up@@ -192,7 +193,6 @@ int32_t Engine::HandleInput(android_app *app, AInputEvent *event) {
 */
void Engine::HandleCmd(struct android_app *app, int32_t cmd) {
 Engine *eng = (Engine *)app->userData;
 LOGI("message %d", cmd);
 switch (cmd) {
 case APP_CMD_SAVE_STATE:
 break;
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/build_sample.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,7 @@ trap cleanup EXIT
# Copy the lib project and run "android update lib-project" on it.
# This requires a target, which apparently needs to be android-10.
cp -r ${lib_project} ${private_lib}
${android_tool} update lib-project --path ${private_lib} --target android-10
${android_tool} update lib-project --path ${private_lib} --target android-22

#
# At last, build!
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content

This repository was archived by the owner on Apr 19, 2026. It is now read-only.

Fix ButtonClicker random crash issue [ the crash happens on 64 bit gpg sdk ]#20
 Closed

ggfan
wants to merge
3
commits into

from

 Closed


Fix ButtonClicker random crash issue [ the crash happens on 64 bit gpg sdk ]
#20
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a6afd45

fixing ButtongClicker 64 bit crash problem


ggfan Aug 31, 2015
58e7062

adding check to gpg login when UI is not ready


ggfan Aug 31, 2015
98d0da4

addressing code review issue


ggfan Sep 1, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
samples-android/ButtonClicker/AndroidManifest.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 package="com.google.example.games.bc3"
 package="com.google.example.games.bc"
 android:versionCode="1"
 android:versionName="1.0" >

 <uses-sdk
 android:minSdkVersion="11"
 android:targetSdkVersion="19" />
 android:targetSdkVersion="22" />

 <uses-feature android:glEsVersion="0x00020000" >
 </uses-feature>
Expand DownExpand Up@@ -47,4 +47,4 @@
 </intent-filter>
 </activity>
 </application>
</manifest>
</manifest>

5 changes: 3 additions & 2 deletions
samples-android/ButtonClicker/jni/Application.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
APP_PLATFORM := android-9
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we keep this at 9?
@ggfanggfanSep 1, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, sure
#APP_ABI := all
APP_ABI := armeabi-v7a
#,arm64-v8a

#APP_ABI:= arm64-v8a
#APP_ABI := all

APP_STL := c++_static

Expand Down

27 changes: 14 additions & 13 deletions
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,15 +105,14 @@ void Engine::InitGooglePlayGameServices() {
 *
 */
void Engine::OnAuthActionStarted(gpg::AuthOperation op) {
 startup_mutex_.lock();
 if (!initialized_resources_) return;

 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, op]() {
 EnableUI(false);
 authorizing_ = true;
 if (op == gpg::AuthOperation::SIGN_IN) {
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you keep the log messages? They help diagnose issues which there always are with authentication.
@ggfanggfanAug 31, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed a couple of LOG messages from sample to make it clean. when UI is up, it is displayed UI page at the bottom in status_text. so we could make it a little clean in logcat
@claywilkinsonclaywilkinsonSep 2, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But when there is a problem, we ask for a log so we can see what is going on - so now we can't see what is going on. Please put them back.
 LOGI("Signing in to GPG");
 status_text_->SetAttribute("Text", "Signing In...");
 } else {
 LOGI("Signing out from GPG");
 status_text_->SetAttribute("Text", "Signing Out...");
 }
 });
Expand All@@ -135,17 +134,19 @@ void Engine::OnAuthActionFinished(gpg::AuthOperation op,
 }
 });
 }

 if (!initialized_resources_) return;


 if (!initialized_resources_) {
 startup_mutex_.unlock();
 return;
 }
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, status]() {
 EnableUI(true);
 authorizing_ = false;
 button_sign_in_->SetAttribute(
 "Text", gpg::IsSuccess(status) ? "Sign Out" : "Sign In");

 status_text_->SetAttribute(
 "Text", gpg::IsSuccess(status) ? "Signed In" : "Signed Out");
 startup_mutex_.unlock();
 });
}

Expand DownExpand Up@@ -560,8 +561,14 @@ void Engine::LeaveGame() {
 * invoking jui_helper functions to create java UIs
 */
void Engine::InitUI() {
 // The window initialization
 jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);

 // Show toast with app label
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([]() {
 if(NULL == jui_helper::JUIWindow::GetInstance()->GetContext()) {
 return;
 }
 jui_helper::JUIToast toast(
 ndk_helper::JNIHelper::GetInstance()->GetAppLabel());
 toast.Show();
Expand All@@ -572,9 +579,6 @@ void Engine::InitUI() {
 // UIs.
 //

 // The window initialization
 jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);

 //
 // Buttons
 //
Expand All@@ -586,7 +590,6 @@ void Engine::InitUI() {
 jui_helper::LAYOUT_PARAMETER_TRUE);
 button_sign_in_->SetCallback([this](jui_helper::JUIView *view,
 const int32_t message) {
 LOGI("button_sign_in_ click: %d", message);
 if (message == jui_helper::JUICALLBACK_BUTTON_UP) {
 if (service_->IsAuthorized()) {
 service_->SignOut();
Expand DownExpand Up@@ -647,7 +650,6 @@ void Engine::InitUI() {
 // Init play game services
 InitGooglePlayGameServices();

 if (authorizing_) EnableUI(false);
 return;
}

Expand All@@ -669,7 +671,6 @@ void Engine::SetParameters(jui_helper::JUIButton *button,
 * Enable/Disable management UI
 */
void Engine::EnableUI(bool enable) {
 LOGI("Updating UI:%d", enable);
 ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, enable]() {
 button_sign_in_->SetAttribute("Enabled", enable);

Expand Down

2 changes: 1 addition & 1 deletion
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,13 +147,13 @@ class Engine : public gpg::IRealTimeEventListener {
 // in OnRoomStatusChanged()
 int32_t score_counter_; // Score counter of local player
 bool playing_; // Am I playing a game?
 bool authorizing_; // Am I signing in to gpg service?
 std::string self_id_; // Local player's ID
 double start_time_; // Game start time

 // synchronization primitive to synchronize
 // UIThread, Timer thread and gpg callback thread
 mutable std::mutex mutex_;
 mutable std::mutex startup_mutex_;
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add a comment on why 2 mutex are needed? It seems like 1 should be ok?
@ggfanggfanAug 31, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one is just for start up code: taking conservative way not to make a big change to the existing code.

 // Renderer of a teapot
 TeapotRenderer renderer_;
Expand Down

4 changes: 2 additions & 2 deletions
samples-android/ButtonClicker/jni/ButtonClickerNativeActivity_Engine.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
Engine::Engine()
 : initialized_resources_(false),
 has_focus_(false),
 authorizing_(false),
 app_(nullptr),
 dialog_(nullptr),
 textViewFPS_(nullptr),
Expand DownExpand Up@@ -61,10 +60,12 @@ void Engine::UnloadResources() { renderer_.Unload(); }
 */
int Engine::InitDisplay(const int32_t cmd) {
 if (!initialized_resources_) {
 startup_mutex_.lock();
 gl_context_->Init(app_->window);
 InitUI();
 LoadResources();
 initialized_resources_ = true;
 startup_mutex_.unlock();
@claywilkinsonclaywilkinsonAug 31, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you catch exceptions to make sure the mutex gets unlocked?
@ggfanggfanSep 1, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is good point. if there is exception in native code, it crashes and there is not any catcher here. I think java code handles lot of exceptions; in side native code, I do not see too much yet.
 } else {
 // initialize OpenGL ES and EGL
 if (EGL_SUCCESS != gl_context_->Resume(app_->window)) {
Expand DownExpand Up@@ -192,7 +193,6 @@ int32_t Engine::HandleInput(android_app *app, AInputEvent *event) {
 */
void Engine::HandleCmd(struct android_app *app, int32_t cmd) {
 Engine *eng = (Engine *)app->userData;
 LOGI("message %d", cmd);
 switch (cmd) {
 case APP_CMD_SAVE_STATE:
 break;
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/build_sample.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,7 @@ trap cleanup EXIT
# Copy the lib project and run "android update lib-project" on it.
# This requires a target, which apparently needs to be android-10.
cp -r ${lib_project} ${private_lib}
${android_tool} update lib-project --path ${private_lib} --target android-10
${android_tool} update lib-project --path ${private_lib} --target android-22

#
# At last, build!
Expand Down