Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Show a progress spinner while loading debugging info.

Browse Source
This commit is contained in:
akwizgran
2014-03-06 15:56:47 +00:00
parent 304ba53807
commit 4875b21614
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
briar-android/src/org/briarproject/android/TestingActivity.java
View File

@@ -11,6 +11,8 @@ import static android.net.ConnectivityManager.TYPE_WIFI;
import static android.net.wifi.WifiManager.WIFI_STATE_ENABLED; import static android.net.wifi.WifiManager.WIFI_STATE_ENABLED;
import static android.view.Gravity.CENTER; import static android.view.Gravity.CENTER;
import static android.view.Gravity.CENTER_HORIZONTAL; import static android.view.Gravity.CENTER_HORIZONTAL;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import static android.widget.LinearLayout.VERTICAL; import static android.widget.LinearLayout.VERTICAL;
import static java.util.logging.Level.INFO; import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
@@ -40,6 +42,7 @@ import org.briarproject.R;
import org.briarproject.android.util.ElasticHorizontalSpace; import org.briarproject.android.util.ElasticHorizontalSpace;
import org.briarproject.android.util.HorizontalBorder; import org.briarproject.android.util.HorizontalBorder;
import org.briarproject.android.util.LayoutUtils; import org.briarproject.android.util.LayoutUtils;
import org.briarproject.android.util.ListLoadingProgressBar;
import org.briarproject.api.TransportId; import org.briarproject.api.TransportId;
import org.briarproject.api.android.AndroidExecutor; import org.briarproject.api.android.AndroidExecutor;
import org.briarproject.api.plugins.Plugin; import org.briarproject.api.plugins.Plugin;
@@ -71,6 +74,7 @@ public class TestingActivity extends BriarActivity implements OnClickListener {
@Inject private AndroidExecutor androidExecutor; @Inject private AndroidExecutor androidExecutor;
@Inject private PluginManager pluginManager; @Inject private PluginManager pluginManager;
private ScrollView scroll = null; private ScrollView scroll = null;
private ListLoadingProgressBar progress = null;
private LinearLayout status = null; private LinearLayout status = null;
private ImageButton refresh = null, share = null; private ImageButton refresh = null, share = null;
private File temp = null; private File temp = null;
@@ -94,6 +98,10 @@ public class TestingActivity extends BriarActivity implements OnClickListener {
scroll.addView(status); scroll.addView(status);
layout.addView(scroll); layout.addView(scroll);
progress = new ListLoadingProgressBar(this);
progress.setVisibility(GONE);
layout.addView(progress);
layout.addView(new HorizontalBorder(this)); layout.addView(new HorizontalBorder(this));
LinearLayout footer = new LinearLayout(this); LinearLayout footer = new LinearLayout(this);
@@ -140,6 +148,8 @@ public class TestingActivity extends BriarActivity implements OnClickListener {
private void refresh() { private void refresh() {
status.removeAllViews(); status.removeAllViews();
scroll.setVisibility(GONE);
progress.setVisibility(VISIBLE);
new AsyncTask<Void, Void, Map<String, String>>() { new AsyncTask<Void, Void, Map<String, String>>() {
protected Map<String, String> doInBackground(Void... args) { protected Map<String, String> doInBackground(Void... args) {
@@ -159,6 +169,8 @@ public class TestingActivity extends BriarActivity implements OnClickListener {
status.addView(content); status.addView(content);
} }
scroll.scrollTo(0, 0); scroll.scrollTo(0, 0);
scroll.setVisibility(VISIBLE);
progress.setVisibility(GONE);
} }
}.execute(); }.execute();
} }
@@ -312,6 +324,8 @@ public class TestingActivity extends BriarActivity implements OnClickListener {
} }
private void share() { private void share() {
scroll.setVisibility(GONE);
progress.setVisibility(VISIBLE);
new AsyncTask<Void, Void, Map<String, String>>() { new AsyncTask<Void, Void, Map<String, String>>() {
protected Map<String, String> doInBackground(Void... args) { protected Map<String, String> doInBackground(Void... args) {
@@ -332,6 +346,8 @@ public class TestingActivity extends BriarActivity implements OnClickListener {
} }
p.flush(); p.flush();
p.close(); p.close();
scroll.setVisibility(VISIBLE);
progress.setVisibility(GONE);
sendEmail(Uri.fromFile(temp)); sendEmail(Uri.fromFile(temp));
} catch(IOException e) { } catch(IOException e) {
if(LOG.isLoggable(WARNING)) if(LOG.isLoggable(WARNING))