Merge branch 'master' into hidden_services
# Conflicts: # app/src/main/java/org/torproject/android/OrbotMainActivity.java
This commit is contained in:
parent
3ba1d395ea
commit
dd99f8f0a3
|
@ -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 {
|
||||
|
||||
|
|
Loading…
Reference in New Issue