bug fix, gradle update, translation update

Signed-off-by: nuclearfog <sufianbekziz@protonmail.com>
nuclearfog · Mar 29, 2024 · 7cb3cf2 · 7cb3cf2
1 parent 93244b6
commit 7cb3cf2
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 27 deletions.
diff --git a/app/.gitignore b/app/.gitignore
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
 		applicationId "com.github.nuclearfog.nitterify"
 		minSdkVersion 11
 		targetSdkVersion 34
-		versionCode 3
-		versionName "2.0"
+		versionCode 4
+		versionName "2.1"
 		resConfigs 'en', 'de'
 	}
 

diff --git a/app/src/main/java/com/github/nuclearfog/nitterify/AppSettings.java b/app/src/main/java/com/github/nuclearfog/nitterify/AppSettings.java
@@ -41,12 +41,20 @@ private AppSettings(Context context) {
 		mode = settings.getInt(SETTINGS_MODE, MODE_DEFAULT);
 	}
 
-
+	/**
+	 * get redirect mode
+	 *
+	 * @return {@link #MODE_DEFAULT,#MODE_CUSTOM}
+	 */
 	public int getMode() {
 		return mode;
 	}
 
-
+	/**
+	 * set redirect mode
+	 *
+	 * @param mode redirect mode {@link #MODE_DEFAULT,#MODE_CUSTOM}
+	 */
 	public void setMode(int mode) {
 		this.mode = mode;
 		settings.edit().putInt(SETTINGS_MODE, mode).apply();

diff --git a/app/src/main/java/com/github/nuclearfog/nitterify/MainActivity.java b/app/src/main/java/com/github/nuclearfog/nitterify/MainActivity.java
@@ -56,16 +56,7 @@ public void onClick(View v) {
 		if (v.getId() == R.id.network_confirm) {
 			String url = urlInput.getText().toString();
 			if (Patterns.WEB_URL.matcher(url).matches()) {
-				// reformat url
-				if (url.startsWith("http://"))
-					url = "https://" + url.substring(7);
-				else if (!url.startsWith("https://"))
-					url = "https://" + url;
-				int index = url.indexOf("/", 8);
-				if (index >= 8)
-					url = url.substring(0, index);
 				urlInput.setText(url);
-				// save url
 				settings.setDomain(url);
 				settings.setMode(AppSettings.MODE_CUSTOM);
 				Toast.makeText(getApplicationContext(), R.string.info_instance_set, Toast.LENGTH_SHORT).show();

diff --git a/app/src/main/java/com/github/nuclearfog/nitterify/NetworkAdapter.java b/app/src/main/java/com/github/nuclearfog/nitterify/NetworkAdapter.java
@@ -13,7 +13,14 @@
  */
 public class NetworkAdapter extends BaseAdapter {
 
+	/**
+	 * item index of the "default nitter instance" entry
+	 */
 	public static final int INDEX_DEFAULT = 0;
+
+	/**
+	 * item index of the "custom nitter instance" entry
+	 */
 	public static final int INDEX_CUSTOM = 1;
 
 	private int[] itemRes;

diff --git a/app/src/main/java/com/github/nuclearfog/nitterify/RedirectActivity.java b/app/src/main/java/com/github/nuclearfog/nitterify/RedirectActivity.java
@@ -8,27 +8,32 @@
 import android.widget.Toast;
 
 /**
- * Activity used to redirect Twitter/X links
+ * Activity used to redirect to nitter instance
  *
  * @author nuclearfog
  */
 public class RedirectActivity extends Activity {
 
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		AppSettings settings = AppSettings.get(getApplicationContext());
-
+		// fetch url to redirect
 		if (getIntent().getData() != null) {
-			String url;
+			Uri redirectUrl;
+			String path = getIntent().getData().getPath();
 			if (settings.getMode() == AppSettings.MODE_CUSTOM) {
-				url = settings.getDomain() + getIntent().getData().getPath();
+				redirectUrl = Uri.parse(settings.getDomain() + path);
+				if (redirectUrl.getScheme() == null)   {
+					redirectUrl = Uri.parse("https://" + settings.getDomain() + path);
+				}
 			} else {
-				url = "https://nitter.net" + getIntent().getData().getPath();
+				redirectUrl = Uri.parse("https://nitter.net" + path);
 			}
 			Intent intent = new Intent(Intent.ACTION_VIEW);
 			intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-			intent.setData(Uri.parse(url));
+			intent.setData(redirectUrl);
 			try {
 				getApplicationContext().startActivity(intent);
 			} catch (ActivityNotFoundException exception) {

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">Nitterify</string>
-	<string name="label_network_selector">Nitter-Instanz auswählen</string>
+    <string name="label_network_selector">Nitter-Instanz auswählen</string>
 	<string name="error_open_link">Link konnte nicht geöffnet werden!</string>
 	<string name="hint_url">Nitter-URL z.B. https://nitter.net</string>
-	<string name="error_wrong_url">Falsches URL-Format!</string>
+	<string name="error_wrong_url">Ungültige URL!</string>
 	<string name="description_button">Instanz-URL sichern</string>
 	<string name="info_instance_set">Instanz-URL gesichert</string>
 	<string name="custom_instance">Benutzerdefinierte Instanz</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">Nitterify</string>
+	<string name="app_name" translatable="false">Nitterify</string>
 	<string name="label_network_selector">Select Nitter instance</string>
 	<string name="error_open_link">could not open link!</string>
 	<string name="hint_url">Nitter url e.g. https://nitter.net</string>

diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
 	}
 
 	dependencies {
-		classpath 'com.android.tools.build:gradle:8.2.0'
+		classpath 'com.android.tools.build:gradle:8.2.2'
 	}
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=600
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists