commit dd99f8f0a3ce2a84c6bb76ce53d3befff62f4143 Author: Juan Ezquerro LLanes juan@paynopain.com Date: Tue Nov 29 11:15:27 2016 +0100
Merge branch 'master' into hidden_services
# Conflicts: # app/src/main/java/org/torproject/android/OrbotMainActivity.java --- app/src/main/java/org/torproject/android/OrbotMainActivity.java | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 020bcb8..1fe6a0b 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -4,6 +4,7 @@ package org.torproject.android;
import java.io.BufferedReader; +import java.io.File; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -26,6 +27,8 @@ import org.torproject.android.ui.AppManager; import org.torproject.android.ui.ImageProgressView; import org.torproject.android.ui.PromoAppsActivity; import org.torproject.android.ui.Rotate3dAnimation; +import org.torproject.android.ui.hiddenservices.backup.BackupUtils; +import org.torproject.android.ui.hiddenservices.providers.HSContentProvider; import org.torproject.android.vpn.VPNEnableActivity;
import android.annotation.SuppressLint; @@ -83,6 +86,8 @@ import android.widget.Toast; import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentResult;
+import static android.support.v4.content.FileProvider.getUriForFile; + public class OrbotMainActivity extends AppCompatActivity implements OrbotConstants, OnLongClickListener, OnTouchListener {