nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Workaround crash in debug activity 

(when progress dialog is visible and changing orientation)
This commit is contained in:
cpfeiffer 2016-06-19 00:53:53 +02:00
parent 0596c80381
commit 7aa900ce82
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/AndroidManifest.xml
View File

@ -216,10 +216,15 @@
</intent-filter> </intent-filter>
</receiver> </receiver>
<!--
forcing the DebugActivity to portrait mode avoids crashes with the progress
dialog when changing orientation
-->
<activity <activity
android:name=".activities.DebugActivity" android:name=".activities.DebugActivity"
android:label="@string/title_activity_debug" android:label="@string/title_activity_debug"
android:parentActivityName=".activities.ControlCenter" android:parentActivityName=".activities.ControlCenter"
android:screenOrientation="portrait"
android:windowSoftInputMode="stateHidden" /> android:windowSoftInputMode="stateHidden" />
<activity <activity
android:name=".activities.DiscoveryActivity" android:name=".activities.DiscoveryActivity"

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
View File

@ -317,7 +317,7 @@ public class DebugActivity extends GBActivity {
return; return;
} }
try (DBHandler targetHandler = GBApplication.acquireDB()) { try (DBHandler targetHandler = GBApplication.acquireDB()) {
final ProgressDialog progress = ProgressDialog.show(DebugActivity.this, "Importing Activity Data", "Please wait while merging your activity data...", true, false); final ProgressDialog progress = ProgressDialog.show(DebugActivity.this, "Merging Activity Data", "Please wait while merging your activity data...", true, false);
new AsyncTask<Object,ProgressDialog,Object>() { new AsyncTask<Object,ProgressDialog,Object>() {
@Override @Override
protected Object doInBackground(Object[] params) { protected Object doInBackground(Object[] params) {