Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors
For #185 ensure intent results and permissions get back to fragment
n8fr884ce00c485bb
diff --git a/src/main/java/org/havenapp/main/SettingsActivity.java b/src/main/java/org/havenapp/main/SettingsActivity.javaindex bb3fb0d..bf24831 100644--- a/src/main/java/org/havenapp/main/SettingsActivity.java+++ b/src/main/java/org/havenapp/main/SettingsActivity.java@@ -18,7 +18,9 @@package org.havenapp.main;+import android.content.Intent;import android.os.Bundle;+import android.support.annotation.NonNull;import android.support.v7.app.AppCompatActivity;import java.io.File;@@ -28,6 +30,8 @@ import info.guardianproject.netcipher.proxy.OrbotHelper;public class SettingsActivity extends AppCompatActivity {+ private SettingsFragment mFragment;+@Overridepublic void onCreate(Bundle savedInstanceState) {super.onCreate(savedInstanceState);@@ -35,10 +39,20 @@ public class SettingsActivity extends AppCompatActivity {setContentView(R.layout.activity_settings);if (savedInstanceState == null) {- SettingsFragment fragment = new SettingsFragment();+ mFragment = new SettingsFragment();getSupportFragmentManager().beginTransaction()- .add(R.id.settings_fragment, fragment)+ .add(R.id.settings_fragment, mFragment).commit();}}++ @Override+ public void onActivityResult(int requestCode, int resultCode, Intent data) {+ mFragment.onActivityResult(requestCode, resultCode, data);+ }++ @Override+ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {+ mFragment.onRequestPermissionsResult(requestCode, permissions, grantResults);+ }}