Merge remote-tracking branch 'origin/dev' into dev

TeamNewPipe · Mar 21, 2018 · 27527b1 · 27527b1
2 parents ae9aa26 + 3bfb593
commit 27527b1
Showing 1 changed file with 1 addition and 44 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
@@ -77,12 +77,10 @@ public class ErrorActivity extends AppCompatActivity {
 
     public static final String ERROR_EMAIL_ADDRESS = "crashreport@newpipe.schabi.org";
     public static final String ERROR_EMAIL_SUBJECT = "Exception in NewPipe " + BuildConfig.VERSION_NAME;
-    Thread globIpRangeThread;
     private String[] errorList;
     private ErrorInfo errorInfo;
     private Class returnActivity;
     private String currentTimeStamp;
-    private String globIpRange;
     // views
     private TextView errorView;
     private EditText userCommentBox;
@@ -224,9 +222,6 @@ protected void onCreate(Bundle savedInstanceState) {
         });
         reportButton.setEnabled(false);
 
-        globIpRangeThread = new Thread(new IpRangeRequester());
-        globIpRangeThread.start();
-
         // normal bugreport
         buildInfo(errorInfo);
         if (errorInfo.message != 0) {
@@ -342,8 +337,7 @@ private String buildJson() {
                     .put("package", getPackageName())
                     .put("version", BuildConfig.VERSION_NAME)
                     .put("os", getOsString())
-                    .put("time", currentTimeStamp)
-                    .put("ip_range", globIpRange);
+                    .put("time", currentTimeStamp);
 
             JSONArray exceptionArray = new JSONArray();
             if (errorList != null) {
@@ -454,41 +448,4 @@ public void writeToParcel(Parcel dest, int flags) {
             dest.writeInt(this.message);
         }
     }
-
-    private class IpRangeRequester implements Runnable {
-        Handler h = new Handler();
-
-        public void run() {
-            String ipRange = "none";
-            try {
-                Downloader dl = Downloader.getInstance();
-                String ip = dl.download("https://ipv4.icanhazip.com");
-
-                ipRange = Parser.matchGroup1("([0-9]*\\.[0-9]*\\.)[0-9]*\\.[0-9]*", ip)
-                        + "0.0";
-            } catch (Throwable e) {
-                Log.w(TAG, "Error while error: could not get iprange", e);
-            } finally {
-                h.post(new IpRangeReturnRunnable(ipRange));
-            }
-        }
-    }
-
-    private class IpRangeReturnRunnable implements Runnable {
-        String ipRange;
-
-        public IpRangeReturnRunnable(String ipRange) {
-            this.ipRange = ipRange;
-        }
-
-        public void run() {
-            globIpRange = ipRange;
-            if (infoView != null) {
-                String text = infoView.getText().toString();
-                text += "\n" + globIpRange;
-                infoView.setText(text);
-                reportButton.setEnabled(true);
-            }
-        }
-    }
 }