mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Removed EULA" 

This reverts commit cee28cd274.
This commit is contained in:
M66B 2018-07-14 15:37:33 +00:00
parent cee28cd274
commit 3f59c82788
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/faircode/netguard/ActivityMain.java
View File

@ -337,10 +337,10 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
View view = inflater.inflate(R.layout.first, null, false); View view = inflater.inflate(R.layout.first, null, false);
TextView tvFirst = view.findViewById(R.id.tvFirst); TextView tvFirst = view.findViewById(R.id.tvFirst);
//TextView tvEula = view.findViewById(R.id.tvEula); TextView tvEula = view.findViewById(R.id.tvEula);
TextView tvPrivacy = view.findViewById(R.id.tvPrivacy); TextView tvPrivacy = view.findViewById(R.id.tvPrivacy);
tvFirst.setMovementMethod(LinkMovementMethod.getInstance()); tvFirst.setMovementMethod(LinkMovementMethod.getInstance());
//tvEula.setMovementMethod(LinkMovementMethod.getInstance()); tvEula.setMovementMethod(LinkMovementMethod.getInstance());
tvPrivacy.setMovementMethod(LinkMovementMethod.getInstance()); tvPrivacy.setMovementMethod(LinkMovementMethod.getInstance());
// Show dialog // Show dialog
@ -1147,7 +1147,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
TextView tvVersionName = view.findViewById(R.id.tvVersionName); TextView tvVersionName = view.findViewById(R.id.tvVersionName);
TextView tvVersionCode = view.findViewById(R.id.tvVersionCode); TextView tvVersionCode = view.findViewById(R.id.tvVersionCode);
Button btnRate = view.findViewById(R.id.btnRate); Button btnRate = view.findViewById(R.id.btnRate);
//TextView tvEula = view.findViewById(R.id.tvEula); TextView tvEula = view.findViewById(R.id.tvEula);
TextView tvPrivacy = view.findViewById(R.id.tvPrivacy); TextView tvPrivacy = view.findViewById(R.id.tvPrivacy);
// Show version // Show version
@ -1157,7 +1157,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
tvVersionCode.setText(Integer.toString(Util.getSelfVersionCode(this))); tvVersionCode.setText(Integer.toString(Util.getSelfVersionCode(this)));
// Handle license // Handle license
//tvEula.setMovementMethod(LinkMovementMethod.getInstance()); tvEula.setMovementMethod(LinkMovementMethod.getInstance());
tvPrivacy.setMovementMethod(LinkMovementMethod.getInstance()); tvPrivacy.setMovementMethod(LinkMovementMethod.getInstance());
// Handle logcat // Handle logcat

4
app/src/main/res/layout/about.xml
View File

@ -86,14 +86,14 @@
android:text="@string/title_rate" android:text="@string/title_rate"
android:visibility="gone" /> android:visibility="gone" />
<!--TextView <TextView
android:id="@+id/tvEula" android:id="@+id/tvEula"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:text="@string/app_eula" android:text="@string/app_eula"
android:textAppearance="@style/TextSmall" android:textAppearance="@style/TextSmall"
android:textSize="12sp" /--> android:textSize="12sp" />
<TextView <TextView
android:id="@+id/tvPrivacy" android:id="@+id/tvPrivacy"

4
app/src/main/res/layout/first.xml
View File

@ -45,13 +45,13 @@
android:text="@string/app_first" android:text="@string/app_first"
android:textAppearance="@style/TextMedium" /> android:textAppearance="@style/TextMedium" />
<!--TextView <TextView
android:id="@+id/tvEula" android:id="@+id/tvEula"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:text="@string/app_eula" android:text="@string/app_eula"
android:textAppearance="@style/TextSmall" /--> android:textAppearance="@style/TextSmall" />
<TextView <TextView
android:id="@+id/tvPrivacy" android:id="@+id/tvPrivacy"