camera: Remove donation related items (f641426d) · Commits · e / os / Camera

app/src/main/java/net/sourceforge/opencamera/MainActivity.java

+0 −13

Original line number	Original line	Diff line number	Diff line
	@@ -666,16 +666,6 @@ public class MainActivity extends AppCompatActivity {
	alertDialog.setTitle(R.string.whats_new);		alertDialog.setTitle(R.string.whats_new);
	alertDialog.setMessage(R.string.whats_new_text);		alertDialog.setMessage(R.string.whats_new_text);
	alertDialog.setPositiveButton(android.R.string.ok, null);		alertDialog.setPositiveButton(android.R.string.ok, null);
	alertDialog.setNegativeButton(R.string.donate, new DialogInterface.OnClickListener() {
	@Override
	public void onClick(DialogInterface dialog, int which) {
	if (MyDebug.LOG)
	Log.d(TAG, "donate");
	// if we change this, remember that any page linked to must abide by Google Play developer policies!
	Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(MainActivity.DonateLink));
	startActivity(browserIntent);
	}
	});
	showAlertDialog(alertDialog, "whats new dialog dismissed");		showAlertDialog(alertDialog, "whats new dialog dismissed");
	}		}
	}		}
	@@ -5518,9 +5508,6 @@ public class MainActivity extends AppCompatActivity {
	this.supports_force_video_4k = false;		this.supports_force_video_4k = false;
	}		}

	// if we change this, remember that any page linked to must abide by Google Play developer policies!
	public static final String DonateLink = "https://play.google.com/store/apps/details?id=harman.mark.donation";

	public Preview getPreview() {		public Preview getPreview() {
	return this.preview;		return this.preview;
	}		}

+0 −28

Original line number	Original line	Diff line number	Diff line
	@@ -1000,34 +1000,6 @@ public class MyPreferenceFragment extends PreferenceFragment implements OnShared
	});		});
	}		}

	{
	final Preference pref = findPreference("preference_donate");
	pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
	@Override
	public boolean onPreferenceClick(Preference arg0) {
	if( pref.getKey().equals("preference_donate") ) {
	if( MyDebug.LOG )
	Log.d(TAG, "user clicked to donate");
	/*Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(MainActivity.getDonateMarketLink()));
	try {
	startActivity(browserIntent);
	}
	catch(ActivityNotFoundException e) {
	// needed in case market:// not supported
	if( MyDebug.LOG )
	Log.d(TAG, "can't launch market:// intent");
	browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(MainActivity.getDonateLink()));
	startActivity(browserIntent);
	}*/
	Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(MainActivity.DonateLink));
	startActivity(browserIntent);
	return false;
	}
	return false;
	}
	});
	}

	{		{
	final Preference pref = findPreference("preference_debug_info");		final Preference pref = findPreference("preference_debug_info");
	pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {		pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1271,12 +1271,6 @@
	android:icon="@drawable/ic_preference_help"		android:icon="@drawable/ic_preference_help"
	/>		/>

	<Preference
	android:key="preference_donate"
	android:title="@string/preference_donate"
	android:summary="@string/preference_donate_summary"
	/>

	<!-- if we move this to another PreferenceGroup, we should update code for the findPreference() call -->		<!-- if we move this to another PreferenceGroup, we should update code for the findPreference() call -->
	<SwitchPreference		<SwitchPreference
	android:key="preference_use_camera2"		android:key="preference_use_camera2"