Skip to content
Snippets Groups Projects
Commit 1dd7a356 authored by Torsten Grote's avatar Torsten Grote
Browse files

Small Improvements for Crash Handling Activities

parent 9135feb9
No related branches found
No related tags found
No related merge requests found
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="7dp"> android:padding="@dimen/margin_activity_horizontal">
<TextView <TextView
android:id="@+id/headlineView" android:id="@+id/headlineView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" style="@style/BriarTextTitle"
android:text="@string/startup_failed_notification_title" android:text="@string/startup_failed_notification_title"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="7dp" android:layout_marginTop="7dp"
......
package org.briarproject.android; package org.briarproject.android;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothAdapter;
import android.content.Context; import android.content.Context;
...@@ -16,6 +15,7 @@ import android.os.AsyncTask; ...@@ -16,6 +15,7 @@ import android.os.AsyncTask;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.support.v7.app.AppCompatActivity;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.widget.ImageButton; import android.widget.ImageButton;
...@@ -69,7 +69,7 @@ import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH; ...@@ -69,7 +69,7 @@ import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP; import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP_1; import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP_1;
public class CrashReportActivity extends Activity implements OnClickListener { public class CrashReportActivity extends AppCompatActivity implements OnClickListener {
private static final Logger LOG = private static final Logger LOG =
Logger.getLogger(CrashReportActivity.class.getName()); Logger.getLogger(CrashReportActivity.class.getName());
...@@ -143,6 +143,14 @@ public class CrashReportActivity extends Activity implements OnClickListener { ...@@ -143,6 +143,14 @@ public class CrashReportActivity extends Activity implements OnClickListener {
if (temp != null) temp.delete(); if (temp != null) temp.delete();
} }
@Override
public void onBackPressed() {
// show home screen, otherwise we are crashing again
Intent intent = new Intent(Intent.ACTION_MAIN);
intent.addCategory(Intent.CATEGORY_HOME);
startActivity(intent);
}
public void onClick(View view) { public void onClick(View view) {
share(); share();
} }
......
...@@ -7,8 +7,6 @@ import android.widget.TextView; ...@@ -7,8 +7,6 @@ import android.widget.TextView;
import org.briarproject.R; import org.briarproject.R;
import roboguice.activity.RoboActivity;
import static org.briarproject.api.lifecycle.LifecycleManager.StartResult; import static org.briarproject.api.lifecycle.LifecycleManager.StartResult;
public class StartupFailureActivity extends BaseActivity { public class StartupFailureActivity extends BaseActivity {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment