mirror of
https://framagit.org/tom79/nitterizeme
synced 2025-02-13 02:00:48 +01:00
Add a release note + avoid to open main activity
This commit is contained in:
parent
41350a89cf
commit
2a5868f3c6
@ -14,8 +14,10 @@ package app.fedilab.nitterizeme.activities;
|
||||
* You should have received a copy of the GNU General Public License along with UntrackMe; if not,
|
||||
* see <http://www.gnu.org/licenses>. */
|
||||
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.IntentFilter;
|
||||
import android.content.SharedPreferences;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
@ -40,6 +42,8 @@ import java.util.Objects;
|
||||
|
||||
import app.fedilab.nitterizeme.R;
|
||||
|
||||
import static app.fedilab.nitterizeme.helpers.Utils.KILL_ACTIVITY;
|
||||
|
||||
public class MainActivity extends AppCompatActivity {
|
||||
|
||||
public static final String APP_PREFS = "app_prefs";
|
||||
@ -59,8 +63,17 @@ public class MainActivity extends AppCompatActivity {
|
||||
public static String DEFAULT_BIBLIOGRAM_HOST = "bibliogram.art";
|
||||
public static String SET_GEO_URIS = "set_geo_uris";
|
||||
public static String SET_EMBEDDED_PLAYER = "set_embedded_player";
|
||||
BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
|
||||
|
||||
|
||||
@Override
|
||||
public void onReceive(Context arg0, Intent intent) {
|
||||
String action = intent.getAction();
|
||||
assert action != null;
|
||||
if (action.compareTo(KILL_ACTIVITY) == 0) {
|
||||
finish();
|
||||
}
|
||||
}
|
||||
};
|
||||
private String nitterHost;
|
||||
private String invidiousHost;
|
||||
private String bibliogramHost;
|
||||
@ -432,7 +445,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
|
||||
}
|
||||
);
|
||||
|
||||
registerReceiver(broadcastReceiver, new IntentFilter(KILL_ACTIVITY));
|
||||
}
|
||||
|
||||
|
||||
@ -456,6 +469,14 @@ public class MainActivity extends AppCompatActivity {
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onDestroy() {
|
||||
super.onDestroy();
|
||||
if (broadcastReceiver != null) {
|
||||
unregisterReceiver(broadcastReceiver);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
|
@ -62,6 +62,7 @@ import static app.fedilab.nitterizeme.activities.MainActivity.SET_BIBLIOGRAM_ENA
|
||||
import static app.fedilab.nitterizeme.activities.MainActivity.SET_EMBEDDED_PLAYER;
|
||||
import static app.fedilab.nitterizeme.activities.MainActivity.SET_INVIDIOUS_ENABLED;
|
||||
import static app.fedilab.nitterizeme.activities.MainActivity.SET_NITTER_ENABLED;
|
||||
import static app.fedilab.nitterizeme.helpers.Utils.KILL_ACTIVITY;
|
||||
import static app.fedilab.nitterizeme.helpers.Utils.ampExtract;
|
||||
import static app.fedilab.nitterizeme.helpers.Utils.bibliogramAccountPattern;
|
||||
import static app.fedilab.nitterizeme.helpers.Utils.bibliogramPostPattern;
|
||||
@ -86,10 +87,11 @@ public class TransformActivity extends Activity {
|
||||
finish();
|
||||
return;
|
||||
}
|
||||
Intent stopMainActivity = new Intent(KILL_ACTIVITY);
|
||||
sendBroadcast(stopMainActivity);
|
||||
notShortnedURLDialog = new ArrayList<>();
|
||||
assert intent != null;
|
||||
//Dealing with URLs
|
||||
|
||||
if (Objects.requireNonNull(intent.getAction()).equals(Intent.ACTION_VIEW)) {
|
||||
String url = Objects.requireNonNull(intent.getData()).toString();
|
||||
URL url_;
|
||||
|
@ -53,6 +53,7 @@ import static app.fedilab.nitterizeme.activities.MainActivity.SET_NITTER_ENABLED
|
||||
|
||||
public class Utils {
|
||||
|
||||
public static final String KILL_ACTIVITY = "kill_activity";
|
||||
public static final Pattern youtubePattern = Pattern.compile("(www\\.|m\\.)?(youtube\\.com|youtu\\.be|youtube-nocookie\\.com)/(((?!([\"'<])).)*)");
|
||||
public static final Pattern nitterPattern = Pattern.compile("(mobile\\.|www\\.)?twitter.com([\\w-/]+)");
|
||||
public static final Pattern bibliogramPostPattern = Pattern.compile("(m\\.|www\\.)?instagram.com(/p/[\\w-/]+)");
|
||||
|
@ -3,4 +3,5 @@ Changed:
|
||||
|
||||
Fixed:
|
||||
- Clicking the warning icon didn't prompt apps
|
||||
- Fix loop when unshortening
|
||||
- Fix loop when unshortening
|
||||
- Fix main activity opened when unshortening
|
Loading…
x
Reference in New Issue
Block a user